diff --git a/sys/sys/fstypes.h b/sys/sys/fstypes.h index ba55187c4b21..a4e7c70e7b13 100644 --- a/sys/sys/fstypes.h +++ b/sys/sys/fstypes.h @@ -1,4 +1,4 @@ -/* $NetBSD: fstypes.h,v 1.24 2008/07/31 05:38:05 simonb Exp $ */ +/* $NetBSD: fstypes.h,v 1.25 2008/07/31 08:44:21 simonb Exp $ */ /* * Copyright (c) 1989, 1991, 1993 @@ -32,7 +32,7 @@ */ #ifndef _SYS_FSTYPES_H_ -#define _SYS_FSTYPES_H_ +#define _SYS_FSTYPES_H_ typedef struct { int32_t __fsid_val[2]; } fsid_t; /* file system id type */ @@ -96,14 +96,14 @@ typedef struct fhandle fhandle_t; #define MNT_UNION 0x00000020 /* union with underlying filesystem */ #define MNT_ASYNC 0x00000040 /* file system written asynchronously */ #define MNT_NOCOREDUMP 0x00008000 /* don't write core dumps to this FS */ -#define MNT_IGNORE 0x00100000 /* don't show entry in df */ +#define MNT_IGNORE 0x00100000 /* don't show entry in df */ #define MNT_LOG 0x02000000 /* Use logging */ -#define MNT_NOATIME 0x04000000 /* Never update access times in fs */ -#define MNT_SYMPERM 0x20000000 /* recognize symlink permission */ -#define MNT_NODEVMTIME 0x40000000 /* Never update mod times for devs */ -#define MNT_SOFTDEP 0x80000000 /* Use soft dependencies */ +#define MNT_NOATIME 0x04000000 /* Never update access times in fs */ +#define MNT_SYMPERM 0x20000000 /* recognize symlink permission */ +#define MNT_NODEVMTIME 0x40000000 /* Never update mod times for devs */ +#define MNT_SOFTDEP 0x80000000 /* Use soft dependencies */ -#define __MNT_BASIC_FLAGS \ +#define __MNT_BASIC_FLAGS \ { MNT_RDONLY, 0, "read-only" }, \ { MNT_SYNCHRONOUS, 0, "synchronous" }, \ { MNT_NOEXEC, 0, "noexec" }, \ @@ -127,10 +127,10 @@ typedef struct fhandle fhandle_t; #define MNT_DEFEXPORTED 0x00000200 /* exported to the world */ #define MNT_EXPORTANON 0x00000400 /* use anon uid mapping for everyone */ #define MNT_EXKERB 0x00000800 /* exported with Kerberos uid mapping */ -#define MNT_EXNORESPORT 0x08000000 /* don't enforce reserved ports (NFS) */ -#define MNT_EXPUBLIC 0x10000000 /* public export (WebNFS) */ +#define MNT_EXNORESPORT 0x08000000 /* don't enforce reserved ports (NFS) */ +#define MNT_EXPUBLIC 0x10000000 /* public export (WebNFS) */ -#define __MNT_EXPORTED_FLAGS \ +#define __MNT_EXPORTED_FLAGS \ { MNT_EXRDONLY, 1, "exported read-only" }, \ { MNT_EXPORTED, 0, "NFS exported" }, \ { MNT_DEFEXPORTED, 1, "exported to the world" }, \ @@ -146,7 +146,7 @@ typedef struct fhandle fhandle_t; #define MNT_QUOTA 0x00002000 /* quotas are enabled on filesystem */ #define MNT_ROOTFS 0x00004000 /* identifies the root filesystem */ -#define __MNT_INTERNAL_FLAGS \ +#define __MNT_INTERNAL_FLAGS \ { MNT_LOCAL, 0, "local" }, \ { MNT_QUOTA, 0, "with quotas" }, \ { MNT_ROOTFS, 1, "root file system" }, @@ -190,7 +190,7 @@ typedef struct fhandle fhandle_t; #define MNT_OP_FLAGS (MNT_UPDATE|MNT_RELOAD|MNT_FORCE|MNT_GETARGS) -#define __MNT_EXTERNAL_FLAGS \ +#define __MNT_EXTERNAL_FLAGS \ { MNT_UPDATE, 1, "being updated" }, \ { MNT_RELOAD, 1, "reload filesystem data" }, \ { MNT_FORCE, 1, "force unmount or readonly change" }, \ @@ -211,13 +211,13 @@ typedef struct fhandle fhandle_t; #define IMNT_HAS_TRANS 0x00000080 /* supports transactions */ #define IMNT_MPSAFE 0x00000100 /* file system code MP safe */ -#define __MNT_FLAGS \ +#define __MNT_FLAGS \ __MNT_BASIC_FLAGS \ __MNT_EXPORTED_FLAGS \ __MNT_INTERNAL_FLAGS \ __MNT_EXTERNAL_FLAGS -#define __MNT_FLAG_BITS \ +#define __MNT_FLAG_BITS \ "\20" \ "\40MNT_SOFTDEP" \ "\37MNT_NODEVMTIME" \ @@ -252,7 +252,7 @@ typedef struct fhandle fhandle_t; "\02MNT_SYNCHRONOUS" \ "\01MNT_RDONLY" -#define __IMNT_FLAG_BITS \ +#define __IMNT_FLAG_BITS \ "\20" \ "\20IMNT_MPSAFE" \ "\10IMNT_HAS_TRANS" \ @@ -266,7 +266,7 @@ typedef struct fhandle fhandle_t; * * waitfor flags to vfs_sync() and getvfsstat() */ -#define MNT_WAIT 1 /* synchronously wait for I/O to complete */ -#define MNT_NOWAIT 2 /* start all I/O, but do not wait for it */ -#define MNT_LAZY 3 /* push data not written by filesystem syncer */ +#define MNT_WAIT 1 /* synchronously wait for I/O to complete */ +#define MNT_NOWAIT 2 /* start all I/O, but do not wait for it */ +#define MNT_LAZY 3 /* push data not written by filesystem syncer */ #endif /* _SYS_FSTYPES_H_ */ diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h index e2763799dbb7..543c7b9b5e86 100644 --- a/sys/ufs/ffs/fs.h +++ b/sys/ufs/ffs/fs.h @@ -1,4 +1,4 @@ -/* $NetBSD: fs.h,v 1.50 2008/07/31 05:38:06 simonb Exp $ */ +/* $NetBSD: fs.h,v 1.51 2008/07/31 08:49:47 simonb Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -86,23 +86,23 @@ #define BBOFF ((off_t)(0)) #define BBLOCK ((daddr_t)(0)) -#define SBLOCK_FLOPPY 0 -#define SBLOCK_UFS1 8192 -#define SBLOCK_UFS2 65536 -#define SBLOCK_PIGGY 262144 -#define SBLOCKSIZE 8192 +#define SBLOCK_FLOPPY 0 +#define SBLOCK_UFS1 8192 +#define SBLOCK_UFS2 65536 +#define SBLOCK_PIGGY 262144 +#define SBLOCKSIZE 8192 /* * NB: Do not, under any circumstances, look for an ffsv1 filesystem at * SBLOCK_UFS2. Doing so will find the wrong superblock for filesystems * with a 64k block size. */ -#define SBLOCKSEARCH \ +#define SBLOCKSEARCH \ { SBLOCK_UFS2, SBLOCK_UFS1, SBLOCK_FLOPPY, SBLOCK_PIGGY, -1 } /* * Max number of fragments per block. This value is NOT tweakable. */ -#define MAXFRAG 8 +#define MAXFRAG 8 @@ -148,7 +148,7 @@ * MAXVOLLEN defines the length of the buffer allocated. * This space used to be part of of fs_fsmnt. */ -#define MAXVOLLEN 32 +#define MAXVOLLEN 32 /* * There is a 128-byte region in the superblock reserved for in-core @@ -181,7 +181,7 @@ * maintaining too many will slow the filesystem performance, so * having this limit is a good idea. */ -#define FSMAXSNAP 20 +#define FSMAXSNAP 20 /* * Used to identify special blocks in snapshots: @@ -194,8 +194,8 @@ * identify blocks that are in use by other snapshots (which are * expunged from this snapshot). */ -#define BLK_NOCOPY ((daddr_t)(1)) -#define BLK_SNAP ((daddr_t)(2)) +#define BLK_NOCOPY ((daddr_t)(1)) +#define BLK_SNAP ((daddr_t)(2)) /* * MINFREE gives the minimum acceptable percentage of file system @@ -363,16 +363,16 @@ struct fs { int32_t fs_magic; /* magic number */ }; -#define fs_old_postbloff fs_spare5[0] -#define fs_old_rotbloff fs_spare5[1] -#define fs_old_postbl_start fs_maxbsize -#define fs_old_headswitch fs_id[0] -#define fs_old_trkseek fs_id[1] -#define fs_old_csmask fs_spare1[0] -#define fs_old_csshift fs_spare1[1] +#define fs_old_postbloff fs_spare5[0] +#define fs_old_rotbloff fs_spare5[1] +#define fs_old_postbl_start fs_maxbsize +#define fs_old_headswitch fs_id[0] +#define fs_old_trkseek fs_id[1] +#define fs_old_csmask fs_spare1[0] +#define fs_old_csshift fs_spare1[1] -#define FS_42POSTBLFMT -1 /* 4.2BSD rotational table format */ -#define FS_DYNAMICPOSTBLFMT 1 /* dynamic rotational table format */ +#define FS_42POSTBLFMT -1 /* 4.2BSD rotational table format */ +#define FS_DYNAMICPOSTBLFMT 1 /* dynamic rotational table format */ #define old_fs_postbl(fs_, cylno, opostblsave) \ ((((fs_)->fs_old_postblformat == FS_42POSTBLFMT) || \ @@ -390,8 +390,8 @@ struct fs { */ #define FS_UFS1_MAGIC 0x011954 /* UFS1 fast file system magic number */ #define FS_UFS2_MAGIC 0x19540119 /* UFS2 fast file system magic number */ -#define FS_UFS1_MAGIC_SWAPPED 0x54190100 -#define FS_UFS2_MAGIC_SWAPPED 0x19015419 +#define FS_UFS1_MAGIC_SWAPPED 0x54190100 +#define FS_UFS2_MAGIC_SWAPPED 0x19015419 #define FS_OKAY 0x7c269d38 /* superblock checksum */ #define FS_42INODEFMT -1 /* 4.2BSD inode format */ #define FS_44INODEFMT 2 /* 4.4BSD inode format */ @@ -413,15 +413,15 @@ struct fs { */ #define FS_UNCLEAN 0x001 /* file system not clean at mount (unused) */ #define FS_DOSOFTDEP 0x002 /* file system using soft dependencies */ -#define FS_NEEDSFSCK 0x004 /* needs sync fsck (FreeBSD compat, unused) */ -#define FS_INDEXDIRS 0x008 /* kernel supports indexed directories */ -#define FS_ACLS 0x010 /* file system has ACLs enabled */ -#define FS_MULTILABEL 0x020 /* file system is MAC multi-label */ -#define FS_FLAGS_UPDATED 0x80 /* flags have been moved to new location */ -#define FS_DOWAPBL 0x100 /* Write ahead physical block logging */ +#define FS_NEEDSFSCK 0x004 /* needs sync fsck (FreeBSD compat, unused) */ +#define FS_INDEXDIRS 0x008 /* kernel supports indexed directories */ +#define FS_ACLS 0x010 /* file system has ACLs enabled */ +#define FS_MULTILABEL 0x020 /* file system is MAC multi-label */ +#define FS_FLAGS_UPDATED 0x80 /* flags have been moved to new location */ +#define FS_DOWAPBL 0x100 /* Write ahead physical block logging */ /* File system flags that are ok for NetBSD if set in fs_flags */ -#define FS_KNOWN_FLAGS (FS_DOSOFTDEP | FS_DOWAPBL) +#define FS_KNOWN_FLAGS (FS_DOSOFTDEP | FS_DOWAPBL) /* * File system internal flags, also in fs_flags. @@ -433,17 +433,17 @@ struct fs { /* * Macros to access bits in the fs_active array. */ -#define ACTIVECG_SET(fs, cg) \ +#define ACTIVECG_SET(fs, cg) \ do { \ if ((fs)->fs_active != NULL) \ setbit((fs)->fs_active, (cg)); \ } while (/*CONSTCOND*/ 0) -#define ACTIVECG_CLR(fs, cg) \ +#define ACTIVECG_CLR(fs, cg) \ do { \ if ((fs)->fs_active != NULL) \ clrbit((fs)->fs_active, (cg)); \ } while (/*CONSTCOND*/ 0) -#define ACTIVECG_ISSET(fs, cg) \ +#define ACTIVECG_ISSET(fs, cg) \ ((fs)->fs_active != NULL && isset((fs)->fs_active, (cg))) /* @@ -467,7 +467,7 @@ struct fs { /* * The minimal number of cylinder groups that should be created. */ -#define MINCYLGRPS 4 +#define MINCYLGRPS 4 /* @@ -538,22 +538,22 @@ struct ocg { /* * Macros for access to cylinder group array structures. */ -#define old_cg_blktot_old(cgp, ns) \ +#define old_cg_blktot_old(cgp, ns) \ (((struct ocg *)(cgp))->cg_btot) -#define old_cg_blks_old(fs, cgp, cylno, ns) \ +#define old_cg_blks_old(fs, cgp, cylno, ns) \ (((struct ocg *)(cgp))->cg_b[cylno]) -#define old_cg_blktot_new(cgp, ns) \ +#define old_cg_blktot_new(cgp, ns) \ ((int32_t *)((u_int8_t *)(cgp) + \ ufs_rw32((cgp)->cg_old_btotoff, (ns)))) -#define old_cg_blks_new(fs, cgp, cylno, ns) \ +#define old_cg_blks_new(fs, cgp, cylno, ns) \ ((int16_t *)((u_int8_t *)(cgp) + \ ufs_rw32((cgp)->cg_old_boff, (ns))) + (cylno) * (fs)->fs_old_nrpos) -#define old_cg_blktot(cgp, ns) \ +#define old_cg_blktot(cgp, ns) \ ((ufs_rw32((cgp)->cg_magic, (ns)) != CG_MAGIC) ? \ old_cg_blktot_old(cgp, ns) : old_cg_blktot_new(cgp, ns)) -#define old_cg_blks(fs, cgp, cylno, ns) \ +#define old_cg_blks(fs, cgp, cylno, ns) \ ((ufs_rw32((cgp)->cg_magic, (ns)) != CG_MAGIC) ? \ old_cg_blks_old(fs, cgp, cylno, ns) : old_cg_blks_new(fs, cgp, cylno, ns)) @@ -566,20 +566,20 @@ struct ocg { #define cg_chkmagic_new(cgp, ns) \ (ufs_rw32((cgp)->cg_magic, (ns)) == CG_MAGIC) -#define cg_inosused_old(cgp, ns) \ +#define cg_inosused_old(cgp, ns) \ (((struct ocg *)(cgp))->cg_iused) -#define cg_blksfree_old(cgp, ns) \ +#define cg_blksfree_old(cgp, ns) \ (((struct ocg *)(cgp))->cg_free) -#define cg_chkmagic_old(cgp, ns) \ +#define cg_chkmagic_old(cgp, ns) \ (ufs_rw32(((struct ocg *)(cgp))->cg_magic, (ns)) == CG_MAGIC) -#define cg_inosused(cgp, ns) \ +#define cg_inosused(cgp, ns) \ ((ufs_rw32((cgp)->cg_magic, (ns)) != CG_MAGIC) ? \ cg_inosused_old(cgp, ns) : cg_inosused_new(cgp, ns)) -#define cg_blksfree(cgp, ns) \ +#define cg_blksfree(cgp, ns) \ ((ufs_rw32((cgp)->cg_magic, (ns)) != CG_MAGIC) ? \ cg_blksfree_old(cgp, ns) : cg_blksfree_new(cgp, ns)) -#define cg_chkmagic(cgp, ns) \ +#define cg_chkmagic(cgp, ns) \ (cg_chkmagic_new(cgp, ns) || cg_chkmagic_old(cgp, ns)) #define cg_clustersfree(cgp, ns) \ @@ -654,7 +654,7 @@ struct ocg { ((loc) & (fs)->fs_qbmask) #define fragoff(fs, loc) /* calculates (loc % fs->fs_fsize) */ \ ((loc) & (fs)->fs_qfmask) -#define lfragtosize(fs, frag) /* calculates ((off_t)frag * fs->fs_fsize) */ \ +#define lfragtosize(fs, frag) /* calculates ((off_t)frag * fs->fs_fsize) */ \ (((off_t)(frag)) << (fs)->fs_fshift) #define lblktosize(fs, blk) /* calculates ((off_t)blk * fs->fs_bsize) */ \ (((off_t)(blk)) << (fs)->fs_bshift) @@ -692,7 +692,7 @@ struct ocg { ? (fs)->fs_bsize \ : (fragroundup(fs, blkoff(fs, (ip)->i_size)))) -#define sblksize(fs, size, lbn) \ +#define sblksize(fs, size, lbn) \ (((lbn) >= NDADDR || (size) >= ((lbn) + 1) << (fs)->fs_bshift) \ ? (fs)->fs_bsize \ : (fragroundup(fs, blkoff(fs, (size))))) @@ -713,11 +713,11 @@ struct ocg { * Apple UFS Label: * We check for this to decide to use APPLEUFS_DIRBLKSIZ */ -#define APPLEUFS_LABEL_MAGIC 0x4c41424c /* LABL */ -#define APPLEUFS_LABEL_SIZE 1024 -#define APPLEUFS_LABEL_OFFSET (BBSIZE - APPLEUFS_LABEL_SIZE) /* located at 7k */ -#define APPLEUFS_LABEL_VERSION 1 -#define APPLEUFS_MAX_LABEL_NAME 512 +#define APPLEUFS_LABEL_MAGIC 0x4c41424c /* LABL */ +#define APPLEUFS_LABEL_SIZE 1024 +#define APPLEUFS_LABEL_OFFSET (BBSIZE - APPLEUFS_LABEL_SIZE) /* located at 7k */ +#define APPLEUFS_LABEL_VERSION 1 +#define APPLEUFS_MAX_LABEL_NAME 512 struct appleufslabel { u_int32_t ul_magic; diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h index c85552d41a5c..e1555c44fab8 100644 --- a/sys/ufs/ufs/inode.h +++ b/sys/ufs/ufs/inode.h @@ -1,4 +1,4 @@ -/* $NetBSD: inode.h,v 1.52 2008/07/31 05:38:06 simonb Exp $ */ +/* $NetBSD: inode.h,v 1.53 2008/07/31 08:49:47 simonb Exp $ */ /* * Copyright (c) 1982, 1989, 1993 @@ -37,7 +37,7 @@ */ #ifndef _UFS_UFS_INODE_H_ -#define _UFS_UFS_INODE_H_ +#define _UFS_UFS_INODE_H_ #include #include @@ -164,15 +164,15 @@ struct inode { #define i_ffs1_rdev i_din.ffs1_din->di_rdev #define i_ffs1_size i_din.ffs1_din->di_size #define i_ffs1_uid i_din.ffs1_din->di_uid -#define i_ffs1_ouid i_din.ffs1_din->di_u.oldids[0] -#define i_ffs1_ogid i_din.ffs1_din->di_u.oldids[1] +#define i_ffs1_ouid i_din.ffs1_din->di_u.oldids[0] +#define i_ffs1_ogid i_din.ffs1_din->di_u.oldids[1] #define i_ffs2_atime i_din.ffs2_din->di_atime #define i_ffs2_atimensec i_din.ffs2_din->di_atimensec -#define i_ffs2_birthtime i_din.ffs2_din->di_birthtime -#define i_ffs2_birthnsec i_din.ffs2_din->di_birthnsec +#define i_ffs2_birthtime i_din.ffs2_din->di_birthtime +#define i_ffs2_birthnsec i_din.ffs2_din->di_birthnsec #define i_ffs2_blocks i_din.ffs2_din->di_blocks -#define i_ffs2_blksize i_din.ffs2_din->di_blksize +#define i_ffs2_blksize i_din.ffs2_din->di_blksize #define i_ffs2_ctime i_din.ffs2_din->di_ctime #define i_ffs2_ctimensec i_din.ffs2_din->di_ctimensec #define i_ffs2_db i_din.ffs2_din->di_db @@ -187,9 +187,9 @@ struct inode { #define i_ffs2_rdev i_din.ffs2_din->di_rdev #define i_ffs2_size i_din.ffs2_din->di_size #define i_ffs2_uid i_din.ffs2_din->di_uid -#define i_ffs2_kernflags i_din.ffs2_din->di_kernflags -#define i_ffs2_extsize i_din.ffs2_din->di_extsize -#define i_ffs2_extb i_din.ffs2_din->di_extb +#define i_ffs2_kernflags i_din.ffs2_din->di_kernflags +#define i_ffs2_extsize i_din.ffs2_din->di_extsize +#define i_ffs2_extb i_din.ffs2_din->di_extb #define i_e2fs_mode i_din.e2fs_din->e2di_mode #define i_e2fs_uid i_din.e2fs_din->e2di_uid @@ -223,8 +223,8 @@ struct inode { #define IN_EXLOCK 0x0080 /* File has exclusive lock. */ #define IN_CLEANING 0x0100 /* LFS: file is being cleaned */ #define IN_ADIROP 0x0200 /* LFS: dirop in progress */ -#define IN_SPACECOUNTED 0x0400 /* Blocks to be freed in free count. */ -#define IN_PAGING 0x1000 /* LFS: file is on paging queue */ +#define IN_SPACECOUNTED 0x0400 /* Blocks to be freed in free count. */ +#define IN_PAGING 0x1000 /* LFS: file is on paging queue */ #if defined(_KERNEL) @@ -232,11 +232,11 @@ struct inode { * The DIP macro is used to access fields in the dinode that are * not cached in the inode itself. */ -#define DIP(ip, field) \ +#define DIP(ip, field) \ (((ip)->i_ump->um_fstype == UFS1) ? \ (ip)->i_ffs1_##field : (ip)->i_ffs2_##field) -#define DIP_ASSIGN(ip, field, value) \ +#define DIP_ASSIGN(ip, field, value) \ do { \ if ((ip)->i_ump->um_fstype == UFS1) \ (ip)->i_ffs1_##field = (value); \ @@ -244,7 +244,7 @@ struct inode { (ip)->i_ffs2_##field = (value); \ } while(0) -#define DIP_ADD(ip, field, value) \ +#define DIP_ADD(ip, field, value) \ do { \ if ((ip)->i_ump->um_fstype == UFS1) \ (ip)->i_ffs1_##field += (value); \ @@ -252,7 +252,7 @@ struct inode { (ip)->i_ffs2_##field += (value); \ } while(0) -#define SHORTLINK(ip) \ +#define SHORTLINK(ip) \ (((ip)->i_ump->um_fstype == UFS1) ? \ (void *)(ip)->i_ffs1_db : (void *)(ip)->i_ffs2_db) diff --git a/sys/ufs/ufs/ufs_wapbl.h b/sys/ufs/ufs/ufs_wapbl.h index 2ec1abcee339..cf3e9ac6653c 100644 --- a/sys/ufs/ufs/ufs_wapbl.h +++ b/sys/ufs/ufs/ufs_wapbl.h @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_wapbl.h,v 1.2 2008/07/31 05:38:07 simonb Exp $ */ +/* $NetBSD: ufs_wapbl.h,v 1.3 2008/07/31 08:49:47 simonb Exp $ */ /*- * Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #ifndef _UFS_UFS_UFS_WAPBL_H_ -#define _UFS_UFS_UFS_WAPBL_H_ +#define _UFS_UFS_UFS_WAPBL_H_ #if defined(_KERNEL_OPT) #include "opt_wapbl.h" @@ -83,7 +83,7 @@ #if defined(WAPBL) #if defined(WAPBL_DEBUG) -#define WAPBL_DEBUG_INODES +#define WAPBL_DEBUG_INODES #endif int wapbl_ufs_rename(void *v); @@ -137,7 +137,7 @@ ufs_wapbl_end2(struct mount *mp, struct vnode *vp1, struct vnode *vp2) #define UFS_WAPBL_END(mp) ufs_wapbl_end2(mp, 0, 0) #define UFS_WAPBL_END1(mp, v1) ufs_wapbl_end2(mp, v1, 0) -#define UFS_WAPBL_UPDATE(vp, access, modify, flags) \ +#define UFS_WAPBL_UPDATE(vp, access, modify, flags) \ if ((vp)->v_mount->mnt_wapbl) { \ UFS_UPDATE(vp, access, modify, flags); \ } @@ -152,25 +152,25 @@ ufs_wapbl_end2(struct mount *mp, struct vnode *vp1, struct vnode *vp2) #define UFS_WAPBL_JUNLOCK_ASSERT(mp) #endif -#define UFS_WAPBL_REGISTER_INODE(mp, ino, mode) \ +#define UFS_WAPBL_REGISTER_INODE(mp, ino, mode) \ if (mp->mnt_wapbl) wapbl_register_inode(mp->mnt_wapbl, ino, mode) -#define UFS_WAPBL_UNREGISTER_INODE(mp, ino, mode) \ +#define UFS_WAPBL_UNREGISTER_INODE(mp, ino, mode) \ if (mp->mnt_wapbl) wapbl_unregister_inode(mp->mnt_wapbl, ino, mode) -#define UFS_WAPBL_REGISTER_DEALLOCATION(mp, blk, len) \ +#define UFS_WAPBL_REGISTER_DEALLOCATION(mp, blk, len) \ if (mp->mnt_wapbl) wapbl_register_deallocation(mp->mnt_wapbl, blk, len) #else /* ! WAPBL */ -#define UFS_WAPBL_BEGIN(mp) 0 -#define UFS_WAPBL_BEGIN1(mp, v1) 0 -#define UFS_WAPBL_END(mp) do { } while (0) -#define UFS_WAPBL_END1(mp, v1) -#define UFS_WAPBL_UPDATE(vp, access, modify, flags) do { } while (0) -#define UFS_WAPBL_JLOCK_ASSERT(mp) -#define UFS_WAPBL_JUNLOCK_ASSERT(mp) -#define UFS_WAPBL_REGISTER_INODE(mp, ino, mode) -#define UFS_WAPBL_UNREGISTER_INODE(mp, ino, mode) -#define UFS_WAPBL_REGISTER_DEALLOCATION(mp, blk, len) +#define UFS_WAPBL_BEGIN(mp) 0 +#define UFS_WAPBL_BEGIN1(mp, v1) 0 +#define UFS_WAPBL_END(mp) do { } while (0) +#define UFS_WAPBL_END1(mp, v1) +#define UFS_WAPBL_UPDATE(vp, access, modify, flags) do { } while (0) +#define UFS_WAPBL_JLOCK_ASSERT(mp) +#define UFS_WAPBL_JUNLOCK_ASSERT(mp) +#define UFS_WAPBL_REGISTER_INODE(mp, ino, mode) +#define UFS_WAPBL_UNREGISTER_INODE(mp, ino, mode) +#define UFS_WAPBL_REGISTER_DEALLOCATION(mp, blk, len) #endif #endif /* !_UFS_UFS_UFS_WAPBL_H_ */