Author: pfg
Date: Wed Mar 5 04:27:15 2014
New Revision: 262780
URL: http://svnweb.freebsd.org/changeset/base/262780
Log:
MFC r262678;
ufs: small formatting fixes.
Cleanup some extra space.
Use of tabs vs. spaces.
No functional change.
Reviewed by: mckusick
Modified:
stable/9/sys/ufs/ffs/ffs_alloc.c
stable/9/sys/ufs/ffs/ffs_balloc.c
stable/9/sys/ufs/ffs/ffs_extern.h
stable/9/sys/ufs/ffs/ffs_snapshot.c
stable/9/sys/ufs/ffs/ffs_softdep.c
stable/9/sys/ufs/ffs/ffs_vfsops.c
stable/9/sys/ufs/ffs/ffs_vnops.c
stable/9/sys/ufs/ffs/fs.h
stable/9/sys/ufs/ffs/softdep.h
stable/9/sys/ufs/ufs/dir.h
stable/9/sys/ufs/ufs/dirhash.h
stable/9/sys/ufs/ufs/extattr.h
stable/9/sys/ufs/ufs/gjournal.h
stable/9/sys/ufs/ufs/inode.h
stable/9/sys/ufs/ufs/quota.h
stable/9/sys/ufs/ufs/ufs_extern.h
stable/9/sys/ufs/ufs/ufsmount.h
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/ufs/ffs/ffs_alloc.c
==============================================================================
--- stable/9/sys/ufs/ffs/ffs_alloc.c Wed Mar 5 04:23:19 2014
(r262779)
+++ stable/9/sys/ufs/ffs/ffs_alloc.c Wed Mar 5 04:27:15 2014
(r262780)
@@ -1181,14 +1181,14 @@ ffs_dirpref(pip)
for (cg = prefcg; cg < fs->fs_ncg; cg++)
if (fs->fs_cs(fs, cg).cs_ndir < maxndir &&
fs->fs_cs(fs, cg).cs_nifree >= minifree &&
- fs->fs_cs(fs, cg).cs_nbfree >= minbfree) {
+ fs->fs_cs(fs, cg).cs_nbfree >= minbfree) {
if (fs->fs_contigdirs[cg] < maxcontigdirs)
return ((ino_t)(fs->fs_ipg * cg));
}
for (cg = 0; cg < prefcg; cg++)
if (fs->fs_cs(fs, cg).cs_ndir < maxndir &&
fs->fs_cs(fs, cg).cs_nifree >= minifree &&
- fs->fs_cs(fs, cg).cs_nbfree >= minbfree) {
+ fs->fs_cs(fs, cg).cs_nbfree >= minbfree) {
if (fs->fs_contigdirs[cg] < maxcontigdirs)
return ((ino_t)(fs->fs_ipg * cg));
}
Modified: stable/9/sys/ufs/ffs/ffs_balloc.c
==============================================================================
--- stable/9/sys/ufs/ffs/ffs_balloc.c Wed Mar 5 04:23:19 2014
(r262779)
+++ stable/9/sys/ufs/ffs/ffs_balloc.c Wed Mar 5 04:27:15 2014
(r262780)
@@ -248,7 +248,7 @@ ffs_balloc_ufs1(struct vnode *vp, off_t
UFS_LOCK(ump);
pref = ffs_blkpref_ufs1(ip, lbn, -indirs[0].in_off - 1,
(ufs1_daddr_t *)0);
- if ((error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize,
+ if ((error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize,
flags, cred, &newb)) != 0) {
curthread_pflags_restore(saved_inbdflush);
return (error);
@@ -809,7 +809,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t
UFS_LOCK(ump);
pref = ffs_blkpref_ufs2(ip, lbn, -indirs[0].in_off - 1,
(ufs2_daddr_t *)0);
- if ((error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize,
+ if ((error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize,
flags, cred, &newb)) != 0) {
curthread_pflags_restore(saved_inbdflush);
return (error);
Modified: stable/9/sys/ufs/ffs/ffs_extern.h
==============================================================================
--- stable/9/sys/ufs/ffs/ffs_extern.h Wed Mar 5 04:23:19 2014
(r262779)
+++ stable/9/sys/ufs/ffs/ffs_extern.h Wed Mar 5 04:27:15 2014
(r262780)
@@ -167,10 +167,10 @@ void softdep_freework(struct workhead *)
/*
* Things to request flushing in softdep_request_cleanup()
*/
-#define FLUSH_INODES 1
-#define FLUSH_INODES_WAIT 2
-#define FLUSH_BLOCKS 3
-#define FLUSH_BLOCKS_WAIT 4
+#define FLUSH_INODES 1
+#define FLUSH_INODES_WAIT 2
+#define FLUSH_BLOCKS 3
+#define FLUSH_BLOCKS_WAIT 4
/*
* Flag to ffs_syncvnode() to request flushing of data only,
* but skip the ffs_update() on the inode itself. Used to avoid
Modified: stable/9/sys/ufs/ffs/ffs_snapshot.c
==============================================================================
--- stable/9/sys/ufs/ffs/ffs_snapshot.c Wed Mar 5 04:23:19 2014
(r262779)
+++ stable/9/sys/ufs/ffs/ffs_snapshot.c Wed Mar 5 04:27:15 2014
(r262780)
@@ -2640,7 +2640,7 @@ ffs_snapdata_acquire(struct vnode *devvp
struct snapdata *sn;
/*
- * Allocate a free snapdata. This is done before acquiring the
+ * Allocate a free snapdata. This is done before acquiring the
* devvp lock to avoid allocation while the devvp interlock is
* held.
*/
Modified: stable/9/sys/ufs/ffs/ffs_softdep.c
==============================================================================
--- stable/9/sys/ufs/ffs/ffs_softdep.c Wed Mar 5 04:23:19 2014
(r262779)
+++ stable/9/sys/ufs/ffs/ffs_softdep.c Wed Mar 5 04:27:15 2014
(r262780)
@@ -118,7 +118,7 @@ softdep_mount(devvp, mp, fs, cred)
return (0);
}
-void
+void
softdep_initialize()
{
@@ -170,7 +170,7 @@ softdep_setup_blkmapdep(bp, mp, newblkno
panic("softdep_setup_blkmapdep called");
}
-void
+void
softdep_setup_allocdirect(ip, lbn, newblkno, oldblkno, newsize, oldsize, bp)
struct inode *ip;
ufs_lbn_t lbn;
@@ -184,7 +184,7 @@ softdep_setup_allocdirect(ip, lbn, newbl
panic("softdep_setup_allocdirect called");
}
-void
+void
softdep_setup_allocext(ip, lbn, newblkno, oldblkno, newsize, oldsize, bp)
struct inode *ip;
ufs_lbn_t lbn;
@@ -263,7 +263,7 @@ softdep_freefile(pvp, ino, mode)
panic("softdep_freefile called");
}
-int
+int
softdep_setup_directory_add(bp, dp, diroffset, newinum, newdirbp, isnewblk)
struct buf *bp;
struct inode *dp;
@@ -276,7 +276,7 @@ softdep_setup_directory_add(bp, dp, diro
panic("softdep_setup_directory_add called");
}
-void
+void
softdep_change_directoryentry_offset(bp, dp, base, oldloc, newloc, entrysize)
struct buf *bp;
struct inode *dp;
@@ -289,7 +289,7 @@ softdep_change_directoryentry_offset(bp,
panic("softdep_change_directoryentry_offset called");
}
-void
+void
softdep_setup_remove(bp, dp, ip, isrmdir)
struct buf *bp;
struct inode *dp;
@@ -300,7 +300,7 @@ softdep_setup_remove(bp, dp, ip, isrmdir
panic("softdep_setup_remove called");
}
-void
+void
softdep_setup_directory_change(bp, dp, ip, newinum, isrmdir)
struct buf *bp;
struct inode *dp;
@@ -461,7 +461,7 @@ softdep_load_inodeblock(ip)
panic("softdep_load_inodeblock called");
}
-void
+void
softdep_update_inodeblock(ip, bp, waitfor)
struct inode *ip;
struct buf *bp;
@@ -828,7 +828,7 @@ static int sync_cgs(struct mount *, int)
static int handle_written_filepage(struct pagedep *, struct buf *);
static int handle_written_sbdep(struct sbdep *, struct buf *);
static void initiate_write_sbdep(struct sbdep *);
-static void diradd_inode_written(struct diradd *, struct inodedep *);
+static void diradd_inode_written(struct diradd *, struct inodedep *);
static int handle_written_indirdep(struct indirdep *, struct buf *,
struct buf**);
static int handle_written_inodeblock(struct inodedep *, struct buf *);
@@ -3268,7 +3268,7 @@ softdep_process_journal(mp, needwk, flag
cnt++;
/*
* Verify some free journal space. softdep_prealloc() should
- * guarantee that we don't run out so this is indicative of
+ * guarantee that we don't run out so this is indicative of
* a problem with the flow control. Try to recover
* gracefully in any event.
*/
@@ -10435,7 +10435,7 @@ softdep_setup_inofree(mp, bp, ino, wkhd)
* We can free immediately even if the jaddref
* isn't attached in a background write as now
* the bitmaps are reconciled.
- */
+ */
wk->wk_state |= COMPLETE | ATTACHED;
free_jaddref(WK_JADDREF(wk));
}
@@ -10605,7 +10605,7 @@ jnewblk_rollback(jnewblk, fs, cgp, blksf
/* Add back in counts associated with the new frags */
blk = blkmap(fs, blksfree, bbase);
ffs_fragacct(fs, blk, cgp->cg_frsum, 1);
- /* If a complete block has been reassembled, account for it. */
+ /* If a complete block has been reassembled, account for it. */
fragno = fragstoblks(fs, bbase);
if (ffs_isblock(fs, blksfree, fragno)) {
cgp->cg_cs.cs_nffree -= fs->fs_frag;
@@ -10620,7 +10620,7 @@ jnewblk_rollback(jnewblk, fs, cgp, blksf
return (frags);
}
-static void
+static void
initiate_write_bmsafemap(bmsafemap, bp)
struct bmsafemap *bmsafemap;
struct buf *bp; /* The cg block. */
Modified: stable/9/sys/ufs/ffs/ffs_vfsops.c
==============================================================================
--- stable/9/sys/ufs/ffs/ffs_vfsops.c Wed Mar 5 04:23:19 2014
(r262779)
+++ stable/9/sys/ufs/ffs/ffs_vfsops.c Wed Mar 5 04:27:15 2014
(r262780)
@@ -1679,7 +1679,7 @@ ffs_vgetf(mp, ino, flags, vpp, ffs_flags
/*
* We must promote to an exclusive lock for vnode creation. This
* can happen if lookup is passed LOCKSHARED.
- */
+ */
if ((flags & LK_TYPE_MASK) == LK_SHARED) {
flags &= ~LK_TYPE_MASK;
flags |= LK_EXCLUSIVE;
Modified: stable/9/sys/ufs/ffs/ffs_vnops.c
==============================================================================
--- stable/9/sys/ufs/ffs/ffs_vnops.c Wed Mar 5 04:23:19 2014
(r262779)
+++ stable/9/sys/ufs/ffs/ffs_vnops.c Wed Mar 5 04:27:15 2014
(r262780)
@@ -719,10 +719,10 @@ ffs_write(ap)
if (uio->uio_offset + xfersize > ip->i_size)
vnode_pager_setsize(vp, uio->uio_offset + xfersize);
- /*
+ /*
* We must perform a read-before-write if the transfer size
* does not cover the entire buffer.
- */
+ */
if (fs->fs_bsize > xfersize)
flags |= BA_CLRBUF;
else
@@ -1082,7 +1082,7 @@ ffs_extwrite(struct vnode *vp, struct ui
/*
* We must perform a read-before-write if the transfer size
* does not cover the entire buffer.
- */
+ */
if (fs->fs_bsize > xfersize)
flags |= BA_CLRBUF;
else
Modified: stable/9/sys/ufs/ffs/fs.h
==============================================================================
--- stable/9/sys/ufs/ffs/fs.h Wed Mar 5 04:23:19 2014 (r262779)
+++ stable/9/sys/ufs/ffs/fs.h Wed Mar 5 04:27:15 2014 (r262780)
@@ -31,7 +31,7 @@
*/
#ifndef _UFS_FFS_FS_H_
-#define _UFS_FFS_FS_H_
+#define _UFS_FFS_FS_H_
#include <sys/mount.h>
#include <ufs/ufs/dinode.h>
@@ -68,18 +68,18 @@
* given in byte-offset form, so they do not imply a sector size. The
* SBLOCKSEARCH specifies the order in which the locations should be searched.
*/
-#define SBLOCK_FLOPPY 0
-#define SBLOCK_UFS1 8192
-#define SBLOCK_UFS2 65536
-#define SBLOCK_PIGGY 262144
-#define SBLOCKSIZE 8192
-#define SBLOCKSEARCH \
+#define SBLOCK_FLOPPY 0
+#define SBLOCK_UFS1 8192
+#define SBLOCK_UFS2 65536
+#define SBLOCK_PIGGY 262144
+#define SBLOCKSIZE 8192
+#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
/*
* Addresses stored in inodes are capable of addressing fragments
@@ -109,20 +109,20 @@
* Note that super blocks are always of size SBLOCKSIZE,
* and that both SBLOCKSIZE and MAXBSIZE must be >= MINBSIZE.
*/
-#define MINBSIZE 4096
+#define MINBSIZE 4096
/*
* The path name on which the filesystem is mounted is maintained
* in fs_fsmnt. MAXMNTLEN defines the amount of space allocated in
* the super block for this name.
*/
-#define MAXMNTLEN 468
+#define MAXMNTLEN 468
/*
* The volume name for this filesystem is maintained in fs_volname.
* MAXVOLLEN defines the length of the buffer allocated.
*/
-#define MAXVOLLEN 32
+#define MAXVOLLEN 32
/*
* There is a 128-byte region in the superblock reserved for in-core
@@ -147,7 +147,7 @@
* value of fs_maxcontig. To conserve space, a maximum summary size
* is set by FS_MAXCONTIG.
*/
-#define FS_MAXCONTIG 16
+#define FS_MAXCONTIG 16
/*
* MINFREE gives the minimum acceptable percentage of filesystem
@@ -161,8 +161,8 @@
* default value. With 10% free space, fragmentation is not a
* problem, so we choose to optimize for time.
*/
-#define MINFREE 8
-#define DEFAULTOPT FS_OPTTIME
+#define MINFREE 8
+#define DEFAULTOPT FS_OPTTIME
/*
* Grigoriy Orlov <g...@ptci.ru> has done some extensive work to fine
@@ -173,8 +173,8 @@
* filesystems, but may need to be tuned for odd cases like filesystems
* being used for squid caches or news spools.
*/
-#define AVFILESIZ 16384 /* expected average file size */
-#define AFPDIR 64 /* expected number of files per directory */
+#define AVFILESIZ 16384 /* expected average file size */
+#define AFPDIR 64 /* expected number of files per
directory */
/*
* The maximum number of snapshot nodes that can be associated
@@ -184,7 +184,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:
@@ -197,8 +197,8 @@
* identify blocks that are in use by other snapshots (which are
* expunged from this snapshot).
*/
-#define BLK_NOCOPY ((ufs2_daddr_t)(1))
-#define BLK_SNAP ((ufs2_daddr_t)(2))
+#define BLK_NOCOPY ((ufs2_daddr_t)(1))
+#define BLK_SNAP ((ufs2_daddr_t)(2))
/*
* Sysctl values for the fast filesystem.
@@ -214,7 +214,7 @@
#define FFS_ADJ_NIFREE 9 /* adjust number of free inodes
*/
#define FFS_ADJ_NFFREE 10 /* adjust number of free frags
*/
#define FFS_ADJ_NUMCLUSTERS 11 /* adjust number of free
clusters */
-#define FFS_SET_CWD 12 /* set current directory */
+#define FFS_SET_CWD 12 /* set current directory */
#define FFS_SET_DOTDOT 13 /* set inode number for ".." */
#define FFS_UNLINK 14 /* remove a name in the
filesystem */
#define FFS_SET_INODE 15 /* update an on-disk inode */
@@ -377,14 +377,14 @@ CTASSERT(sizeof(struct fs) == 1376);
#define FS_UFS2_MAGIC 0x19540119 /* UFS2 fast filesystem magic
number */
#define FS_BAD_MAGIC 0x19960408 /* UFS incomplete newfs magic
number */
#define FS_OKAY 0x7c269d38 /* superblock checksum */
-#define FS_42INODEFMT -1 /* 4.2BSD inode format */
-#define FS_44INODEFMT 2 /* 4.4BSD inode format */
+#define FS_42INODEFMT -1 /* 4.2BSD inode format */
+#define FS_44INODEFMT 2 /* 4.4BSD inode format */
/*
* Preference for optimization.
*/
-#define FS_OPTTIME 0 /* minimize allocation time */
-#define FS_OPTSPACE 1 /* minimize disk fragmentation */
+#define FS_OPTTIME 0 /* minimize allocation time */
+#define FS_OPTSPACE 1 /* minimize disk fragmentation */
/*
* Filesystem flags.
@@ -414,16 +414,16 @@ CTASSERT(sizeof(struct fs) == 1376);
* labels into extended attributes on the file system rather than maintain
* a single mount label for all objects.
*/
-#define FS_UNCLEAN 0x0001 /* filesystem not clean at mount */
-#define FS_DOSOFTDEP 0x0002 /* filesystem using soft dependencies */
-#define FS_NEEDSFSCK 0x0004 /* filesystem needs sync fsck before mount */
+#define FS_UNCLEAN 0x0001 /* filesystem not clean at mount */
+#define FS_DOSOFTDEP 0x0002 /* filesystem using soft dependencies */
+#define FS_NEEDSFSCK 0x0004 /* filesystem needs sync fsck before
mount */
#define FS_SUJ 0x0008 /* Filesystem using softupdate journal
*/
-#define FS_ACLS 0x0010 /* file system has POSIX.1e ACLs
enabled */
-#define FS_MULTILABEL 0x0020 /* file system is MAC multi-label */
-#define FS_GJOURNAL 0x0040 /* gjournaled file system */
-#define FS_FLAGS_UPDATED 0x0080 /* flags have been moved to new
location */
-#define FS_NFS4ACLS 0x0100 /* file system has NFSv4 ACLs enabled */
-#define FS_INDEXDIRS 0x0200 /* kernel supports indexed directories */
+#define FS_ACLS 0x0010 /* file system has POSIX.1e ACLs
enabled */
+#define FS_MULTILABEL 0x0020 /* file system is MAC multi-label */
+#define FS_GJOURNAL 0x0040 /* gjournaled file system */
+#define FS_FLAGS_UPDATED 0x0080 /* flags have been moved to new
location */
+#define FS_NFS4ACLS 0x0100 /* file system has NFSv4 ACLs enabled */
+#define FS_INDEXDIRS 0x0200 /* kernel supports indexed directories
*/
#define FS_TRIM 0x0400 /* issue BIO_DELETE for deleted blocks
*/
/*
@@ -446,7 +446,7 @@ CTASSERT(sizeof(struct fs) == 1376);
* Its size is derived from the size of the maps maintained in the
* cylinder group and the (struct cg) size.
*/
-#define CGSIZE(fs) \
+#define CGSIZE(fs) \
/* base cg */ (sizeof(struct cg) + sizeof(int32_t) + \
/* old btotoff */ (fs)->fs_old_cpg * sizeof(int32_t) + \
/* old boff */ (fs)->fs_old_cpg * sizeof(u_int16_t) + \
@@ -459,12 +459,12 @@ CTASSERT(sizeof(struct fs) == 1376);
/*
* The minimal number of cylinder groups that should be created.
*/
-#define MINCYLGRPS 4
+#define MINCYLGRPS 4
/*
* Convert cylinder group to base address of its global summary info.
*/
-#define fs_cs(fs, indx) fs_csp[indx]
+#define fs_cs(fs, indx) fs_csp[indx]
/*
* Cylinder group block for a filesystem.
@@ -504,14 +504,14 @@ struct cg {
/*
* Macros for access to cylinder group array structures
*/
-#define cg_chkmagic(cgp) ((cgp)->cg_magic == CG_MAGIC)
-#define cg_inosused(cgp) \
+#define cg_chkmagic(cgp) ((cgp)->cg_magic == CG_MAGIC)
+#define cg_inosused(cgp) \
((u_int8_t *)((u_int8_t *)(cgp) + (cgp)->cg_iusedoff))
-#define cg_blksfree(cgp) \
+#define cg_blksfree(cgp) \
((u_int8_t *)((u_int8_t *)(cgp) + (cgp)->cg_freeoff))
-#define cg_clustersfree(cgp) \
+#define cg_clustersfree(cgp) \
((u_int8_t *)((u_int8_t *)(cgp) + (cgp)->cg_clusteroff))
-#define cg_clustersum(cgp) \
+#define cg_clustersum(cgp) \
((int32_t *)((uintptr_t)(cgp) + (cgp)->cg_clustersumoff))
/*
@@ -532,7 +532,7 @@ struct cg {
#define cgimin(fs, c) (cgstart(fs, c) + (fs)->fs_iblkno) /*
inode blk */
#define cgsblock(fs, c) (cgstart(fs, c) + (fs)->fs_sblkno) /*
super blk */
#define cgtod(fs, c) (cgstart(fs, c) + (fs)->fs_cblkno) /* cg
block */
-#define cgstart(fs, c) \
+#define cgstart(fs, c)
\
((fs)->fs_magic == FS_UFS2_MAGIC ? cgbase(fs, c) : \
(cgbase(fs, c) + (fs)->fs_old_cgoffset * ((c) &
~((fs)->fs_old_cgmask))))
@@ -559,7 +559,7 @@ struct cg {
* Extract the bits for a block from a map.
* Compute the cylinder and rotational position of a cyl block addr.
*/
-#define blkmap(fs, map, loc) \
+#define blkmap(fs, map, loc) \
(((map)[(loc) / NBBY] >> ((loc) % NBBY)) & (0xff >> (NBBY -
(fs)->fs_frag)))
/*
@@ -567,39 +567,39 @@ struct cg {
* quantities by using shifts and masks in place of divisions
* modulos and multiplications.
*/
-#define blkoff(fs, loc) /* calculates (loc % fs->fs_bsize) */ \
+#define blkoff(fs, loc) /* calculates (loc % fs->fs_bsize) */ \
((loc) & (fs)->fs_qbmask)
-#define fragoff(fs, loc) /* calculates (loc % fs->fs_fsize) */ \
+#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) */ \
+#define lblktosize(fs, blk) /* calculates ((off_t)blk *
fs->fs_bsize) */ \
(((off_t)(blk)) << (fs)->fs_bshift)
/* Use this only when `blk' is known to be small, e.g., < NDADDR. */
-#define smalllblktosize(fs, blk) /* calculates (blk * fs->fs_bsize) */ \
+#define smalllblktosize(fs, blk) /* calculates (blk * fs->fs_bsize)
*/ \
((blk) << (fs)->fs_bshift)
-#define lblkno(fs, loc) /* calculates (loc / fs->fs_bsize) */ \
+#define lblkno(fs, loc) /* calculates (loc / fs->fs_bsize) */ \
((loc) >> (fs)->fs_bshift)
-#define numfrags(fs, loc) /* calculates (loc / fs->fs_fsize) */ \
+#define numfrags(fs, loc) /* calculates (loc / fs->fs_fsize) */ \
((loc) >> (fs)->fs_fshift)
-#define blkroundup(fs, size) /* calculates roundup(size, fs->fs_bsize) */ \
+#define blkroundup(fs, size) /* calculates roundup(size,
fs->fs_bsize) */ \
(((size) + (fs)->fs_qbmask) & (fs)->fs_bmask)
-#define fragroundup(fs, size) /* calculates roundup(size, fs->fs_fsize) */ \
+#define fragroundup(fs, size) /* calculates roundup(size,
fs->fs_fsize) */ \
(((size) + (fs)->fs_qfmask) & (fs)->fs_fmask)
-#define fragstoblks(fs, frags) /* calculates (frags / fs->fs_frag) */ \
+#define fragstoblks(fs, frags) /* calculates (frags / fs->fs_frag) */ \
((frags) >> (fs)->fs_fragshift)
-#define blkstofrags(fs, blks) /* calculates (blks * fs->fs_frag) */ \
+#define blkstofrags(fs, blks) /* calculates (blks * fs->fs_frag) */ \
((blks) << (fs)->fs_fragshift)
-#define fragnum(fs, fsb) /* calculates (fsb % fs->fs_frag) */ \
+#define fragnum(fs, fsb) /* calculates (fsb % fs->fs_frag) */ \
((fsb) & ((fs)->fs_frag - 1))
-#define blknum(fs, fsb) /* calculates rounddown(fsb,
fs->fs_frag) */ \
+#define blknum(fs, fsb) /* calculates rounddown(fsb,
fs->fs_frag) */ \
((fsb) &~ ((fs)->fs_frag - 1))
/*
* Determine the number of available frags given a
* percentage to hold in reserve.
*/
-#define freespace(fs, percentreserved) \
+#define freespace(fs, percentreserved) \
(blkstofrags((fs), (fs)->fs_cstotal.cs_nbfree) + \
(fs)->fs_cstotal.cs_nffree - \
(((off_t)((fs)->fs_dsize)) * (percentreserved) / 100))
@@ -607,11 +607,11 @@ struct cg {
/*
* Determining the size of a file block in the filesystem.
*/
-#define blksize(fs, ip, lbn) \
+#define blksize(fs, ip, lbn) \
(((lbn) >= NDADDR || (ip)->i_size >= smalllblktosize(fs, (lbn) + 1)) \
? (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)))))
Modified: stable/9/sys/ufs/ffs/softdep.h
==============================================================================
--- stable/9/sys/ufs/ffs/softdep.h Wed Mar 5 04:23:19 2014
(r262779)
+++ stable/9/sys/ufs/ffs/softdep.h Wed Mar 5 04:27:15 2014
(r262780)
@@ -170,22 +170,22 @@ struct worklist {
unsigned int wk_type:8, /* type of request */
wk_state:24; /* state flags */
};
-#define WK_DATA(wk) ((void *)(wk))
-#define WK_PAGEDEP(wk) ((struct pagedep *)(wk))
-#define WK_INODEDEP(wk) ((struct inodedep *)(wk))
-#define WK_BMSAFEMAP(wk) ((struct bmsafemap *)(wk))
+#define WK_DATA(wk) ((void *)(wk))
+#define WK_PAGEDEP(wk) ((struct pagedep *)(wk))
+#define WK_INODEDEP(wk) ((struct inodedep *)(wk))
+#define WK_BMSAFEMAP(wk) ((struct bmsafemap *)(wk))
#define WK_NEWBLK(wk) ((struct newblk *)(wk))
-#define WK_ALLOCDIRECT(wk) ((struct allocdirect *)(wk))
-#define WK_INDIRDEP(wk) ((struct indirdep *)(wk))
-#define WK_ALLOCINDIR(wk) ((struct allocindir *)(wk))
-#define WK_FREEFRAG(wk) ((struct freefrag *)(wk))
-#define WK_FREEBLKS(wk) ((struct freeblks *)(wk))
-#define WK_FREEWORK(wk) ((struct freework *)(wk))
-#define WK_FREEFILE(wk) ((struct freefile *)(wk))
-#define WK_DIRADD(wk) ((struct diradd *)(wk))
-#define WK_MKDIR(wk) ((struct mkdir *)(wk))
-#define WK_DIRREM(wk) ((struct dirrem *)(wk))
-#define WK_NEWDIRBLK(wk) ((struct newdirblk *)(wk))
+#define WK_ALLOCDIRECT(wk) ((struct allocdirect *)(wk))
+#define WK_INDIRDEP(wk) ((struct indirdep *)(wk))
+#define WK_ALLOCINDIR(wk) ((struct allocindir *)(wk))
+#define WK_FREEFRAG(wk) ((struct freefrag *)(wk))
+#define WK_FREEBLKS(wk) ((struct freeblks *)(wk))
+#define WK_FREEWORK(wk) ((struct freework *)(wk))
+#define WK_FREEFILE(wk) ((struct freefile *)(wk))
+#define WK_DIRADD(wk) ((struct diradd *)(wk))
+#define WK_MKDIR(wk) ((struct mkdir *)(wk))
+#define WK_DIRREM(wk) ((struct dirrem *)(wk))
+#define WK_NEWDIRBLK(wk) ((struct newdirblk *)(wk))
#define WK_JADDREF(wk) ((struct jaddref *)(wk))
#define WK_JREMREF(wk) ((struct jremref *)(wk))
#define WK_JMVREF(wk) ((struct jmvref *)(wk))
@@ -239,8 +239,8 @@ TAILQ_HEAD(freeblklst, freeblks);
* list, any removed operations are done, and the dependency structure
* is freed.
*/
-#define DAHASHSZ 5
-#define DIRADDHASH(offset) (((offset) >> 2) % DAHASHSZ)
+#define DAHASHSZ 5
+#define DIRADDHASH(offset) (((offset) >> 2) % DAHASHSZ)
struct pagedep {
struct worklist pd_list; /* page buffer */
# define pd_state pd_list.wk_state /* check for multiple I/O starts */
@@ -330,8 +330,8 @@ struct inodedep {
struct ufs2_dinode *idu_savedino2; /* saved ufs2_dinode contents */
} id_un;
};
-#define id_savedino1 id_un.idu_savedino1
-#define id_savedino2 id_un.idu_savedino2
+#define id_savedino1 id_un.idu_savedino1
+#define id_savedino2 id_un.idu_savedino2
/*
* A "bmsafemap" structure maintains a list of dependency structures
@@ -644,8 +644,8 @@ struct diradd {
} da_un;
struct workhead da_jwork; /* Journal work awaiting completion. */
};
-#define da_previous da_un.dau_previous
-#define da_pagedep da_un.dau_pagedep
+#define da_previous da_un.dau_previous
+#define da_pagedep da_un.dau_pagedep
/*
* Two "mkdir" structures are needed to track the additional dependencies
@@ -701,8 +701,8 @@ struct dirrem {
} dm_un;
struct workhead dm_jwork; /* Journal work awaiting completion. */
};
-#define dm_pagedep dm_un.dmu_pagedep
-#define dm_dirinum dm_un.dmu_dirinum
+#define dm_pagedep dm_un.dmu_pagedep
+#define dm_dirinum dm_un.dmu_dirinum
/*
* A "newdirblk" structure tracks the progress of a newly allocated
Modified: stable/9/sys/ufs/ufs/dir.h
==============================================================================
--- stable/9/sys/ufs/ufs/dir.h Wed Mar 5 04:23:19 2014 (r262779)
+++ stable/9/sys/ufs/ufs/dir.h Wed Mar 5 04:27:15 2014 (r262780)
@@ -44,7 +44,7 @@
* quantity to keep down the cost of doing lookup on a 32-bit machine.
*/
#define doff_t int32_t
-#define MAXDIRSIZE (0x7fffffff)
+#define MAXDIRSIZE (0x7fffffff)
/*
* A directory consists of some number of blocks of DIRBLKSIZ
@@ -71,7 +71,7 @@
* Entries other than the first in a directory do not normally have
* dp->d_ino set to 0.
*/
-#define DIRBLKSIZ DEV_BSIZE
+#define DIRBLKSIZ DEV_BSIZE
#define MAXNAMLEN 255
struct direct {
@@ -113,14 +113,14 @@ struct direct {
(((uintptr_t)&((struct direct *)0)->d_name + \
((namlen)+1)*sizeof(((struct direct *)0)->d_name[0]) + 3) & ~3)
#if (BYTE_ORDER == LITTLE_ENDIAN)
-#define DIRSIZ(oldfmt, dp) \
+#define DIRSIZ(oldfmt, dp) \
((oldfmt) ? DIRECTSIZ((dp)->d_type) : DIRECTSIZ((dp)->d_namlen))
#else
-#define DIRSIZ(oldfmt, dp) \
+#define DIRSIZ(oldfmt, dp) \
DIRECTSIZ((dp)->d_namlen)
#endif
-#define OLDDIRFMT 1
-#define NEWDIRFMT 0
+#define OLDDIRFMT 1
+#define NEWDIRFMT 0
/*
* Template for manipulating directories. Should use struct direct's,
Modified: stable/9/sys/ufs/ufs/dirhash.h
==============================================================================
--- stable/9/sys/ufs/ufs/dirhash.h Wed Mar 5 04:23:19 2014
(r262779)
+++ stable/9/sys/ufs/ufs/dirhash.h Wed Mar 5 04:27:15 2014
(r262780)
@@ -26,7 +26,7 @@
*/
#ifndef _UFS_UFS_DIRHASH_H_
-#define _UFS_UFS_DIRHASH_H_
+#define _UFS_UFS_DIRHASH_H_
#include <sys/_lock.h>
#include <sys/_sx.h>
@@ -44,11 +44,11 @@
* We also maintain information about free space in each block
* to speed up creations.
*/
-#define DIRHASH_EMPTY (-1) /* entry unused */
-#define DIRHASH_DEL (-2) /* deleted entry; may be part of chain */
+#define DIRHASH_EMPTY (-1) /* entry unused */
+#define DIRHASH_DEL (-2) /* deleted entry; may be part of chain
*/
-#define DIRALIGN 4
-#define DH_NFSTATS (DIRECTSIZ(MAXNAMLEN + 1) / DIRALIGN)
+#define DIRALIGN 4
+#define DH_NFSTATS (DIRECTSIZ(MAXNAMLEN + 1) / DIRALIGN)
/* max DIRALIGN words in a directory entry */
/*
@@ -68,18 +68,18 @@
* case it limits the number of hash builds to 1/DH_SCOREINIT of the
* number of accesses.
*/
-#define DH_SCOREINIT 8 /* initial dh_score when dirhash built */
-#define DH_SCOREMAX 64 /* max dh_score value */
+#define DH_SCOREINIT 8 /* initial dh_score when dirhash built
*/
+#define DH_SCOREMAX 64 /* max dh_score value */
/*
* The main hash table has 2 levels. It is an array of pointers to
* blocks of DH_NBLKOFF offsets.
*/
-#define DH_BLKOFFSHIFT 8
-#define DH_NBLKOFF (1 << DH_BLKOFFSHIFT)
-#define DH_BLKOFFMASK (DH_NBLKOFF - 1)
+#define DH_BLKOFFSHIFT 8
+#define DH_NBLKOFF (1 << DH_BLKOFFSHIFT)
+#define DH_BLKOFFMASK (DH_NBLKOFF - 1)
-#define DH_ENTRY(dh, slot) \
+#define DH_ENTRY(dh, slot) \
((dh)->dh_hash[(slot) >> DH_BLKOFFSHIFT][(slot) & DH_BLKOFFMASK])
struct dirhash {
Modified: stable/9/sys/ufs/ufs/extattr.h
==============================================================================
--- stable/9/sys/ufs/ufs/extattr.h Wed Mar 5 04:23:19 2014
(r262779)
+++ stable/9/sys/ufs/ufs/extattr.h Wed Mar 5 04:27:15 2014
(r262780)
@@ -94,14 +94,14 @@ struct extattr {
* attribute name to calculate and set the ea_length, ea_namelength,
* and ea_contentpadlen fields of the extended attribute structure.
*/
-#define EXTATTR_NEXT(eap) \
+#define EXTATTR_NEXT(eap) \
((struct extattr *)(((void *)(eap)) + (eap)->ea_length))
-#define EXTATTR_CONTENT(eap) (((void *)(eap)) + EXTATTR_BASE_LENGTH(eap))
-#define EXTATTR_CONTENT_SIZE(eap) \
+#define EXTATTR_CONTENT(eap) (((void *)(eap)) +
EXTATTR_BASE_LENGTH(eap))
+#define EXTATTR_CONTENT_SIZE(eap) \
((eap)->ea_length - EXTATTR_BASE_LENGTH(eap) - (eap)->ea_contentpadlen)
-#define EXTATTR_BASE_LENGTH(eap) \
+#define EXTATTR_BASE_LENGTH(eap) \
((sizeof(struct extattr) + (eap)->ea_namelength + 7) & ~7)
-#define EXTATTR_SET_LENGTHS(eap, contentsize) do { \
+#define EXTATTR_SET_LENGTHS(eap, contentsize) do { \
KASSERT(((eap)->ea_name[0] != 0), \
("Must initialize name before setting lengths")); \
(eap)->ea_namelength = strlen((eap)->ea_name); \
@@ -152,7 +152,7 @@ void ufs_extattr_vnode_inactive(struct v
#else
/* User-level definition of KASSERT for macros above */
-#define KASSERT(cond, str) do { \
+#define KASSERT(cond, str) do { \
if (!(cond)) { printf("panic: "); printf(str); printf("\n"); exit(1);
}\
} while (0)
Modified: stable/9/sys/ufs/ufs/gjournal.h
==============================================================================
--- stable/9/sys/ufs/ufs/gjournal.h Wed Mar 5 04:23:19 2014
(r262779)
+++ stable/9/sys/ufs/ufs/gjournal.h Wed Mar 5 04:27:15 2014
(r262780)
@@ -27,7 +27,7 @@
*/
#ifndef _UFS_UFS_GJOURNAL_H_
-#define _UFS_UFS_GJOURNAL_H_
+#define _UFS_UFS_GJOURNAL_H_
/*
* GEOM journal function prototypes.
Modified: stable/9/sys/ufs/ufs/inode.h
==============================================================================
--- stable/9/sys/ufs/ufs/inode.h Wed Mar 5 04:23:19 2014
(r262779)
+++ stable/9/sys/ufs/ufs/inode.h Wed Mar 5 04:27:15 2014
(r262780)
@@ -129,12 +129,12 @@ struct inode {
#define IN_TRUNCATED 0x0800 /* Journaled truncation
pending. */
-#define i_devvp i_ump->um_devvp
-#define i_umbufobj i_ump->um_bo
-#define i_dirhash i_un.dirhash
-#define i_snapblklist i_un.snapblklist
-#define i_din1 dinode_u.din1
-#define i_din2 dinode_u.din2
+#define i_devvp i_ump->um_devvp
+#define i_umbufobj i_ump->um_bo
+#define i_dirhash i_un.dirhash
+#define i_snapblklist i_un.snapblklist
+#define i_din1 dinode_u.din1
+#define i_din2 dinode_u.din2
#ifdef _KERNEL
/*
@@ -154,7 +154,7 @@ struct inode {
#define SHORTLINK(ip) \
(((ip)->i_ump->um_fstype == UFS1) ? \
(caddr_t)(ip)->i_din1->di_db : (caddr_t)(ip)->i_din2->di_db)
-#define IS_SNAPSHOT(ip) ((ip)->i_flags & SF_SNAPSHOT)
+#define IS_SNAPSHOT(ip) ((ip)->i_flags & SF_SNAPSHOT)
/*
* Structure used to pass around logical block paths generated by
@@ -166,14 +166,14 @@ struct indir {
};
/* Convert between inode pointers and vnode pointers. */
-#define VTOI(vp) ((struct inode *)(vp)->v_data)
-#define ITOV(ip) ((ip)->i_vnode)
+#define VTOI(vp) ((struct inode *)(vp)->v_data)
+#define ITOV(ip) ((ip)->i_vnode)
/* Determine if soft dependencies are being done */
-#define DOINGSOFTDEP(vp) ((vp)->v_mount->mnt_flag & (MNT_SOFTDEP | MNT_SUJ))
-#define MOUNTEDSOFTDEP(mp) ((mp)->mnt_flag & (MNT_SOFTDEP | MNT_SUJ))
-#define DOINGSUJ(vp) ((vp)->v_mount->mnt_flag & MNT_SUJ)
-#define MOUNTEDSUJ(mp) ((mp)->mnt_flag & MNT_SUJ)
+#define DOINGSOFTDEP(vp) ((vp)->v_mount->mnt_flag & (MNT_SOFTDEP |
MNT_SUJ))
+#define MOUNTEDSOFTDEP(mp) ((mp)->mnt_flag & (MNT_SOFTDEP | MNT_SUJ))
+#define DOINGSUJ(vp) ((vp)->v_mount->mnt_flag & MNT_SUJ)
+#define MOUNTEDSUJ(mp) ((mp)->mnt_flag & MNT_SUJ)
/* This overlays the fid structure (see mount.h). */
struct ufid {
Modified: stable/9/sys/ufs/ufs/quota.h
==============================================================================
--- stable/9/sys/ufs/ufs/quota.h Wed Mar 5 04:23:19 2014
(r262779)
+++ stable/9/sys/ufs/ufs/quota.h Wed Mar 5 04:27:15 2014
(r262780)
@@ -62,7 +62,7 @@
/*
* Definitions for the default names of the quotas files.
*/
-#define INITQFNAMES { \
+#define INITQFNAMES { \
"user", /* USRQUOTA */ \
"group", /* GRPQUOTA */ \
"undefined", \
@@ -75,8 +75,8 @@
* broken into a main command defined below and a subcommand that is used
* to convey the type of quota that is being manipulated (see above).
*/
-#define SUBCMDMASK 0x00ff
-#define SUBCMDSHIFT 8
+#define SUBCMDMASK 0x00ff
+#define SUBCMDSHIFT 8
#define QCMD(cmd, type) (((cmd) << SUBCMDSHIFT) | ((type) & SUBCMDMASK))
#define Q_QUOTAON 0x0100 /* enable quotas */
@@ -119,10 +119,10 @@ struct dqblk64 {
int64_t dqb_itime; /* time limit for excessive files */
};
-#define dqblk dqblk64
+#define dqblk dqblk64
-#define Q_DQHDR64_MAGIC "QUOTA64"
-#define Q_DQHDR64_VERSION 0x20081104
+#define Q_DQHDR64_MAGIC "QUOTA64"
+#define Q_DQHDR64_VERSION 0x20081104
struct dqhdr64 {
char dqh_magic[8]; /* Q_DQHDR64_MAGIC */
Modified: stable/9/sys/ufs/ufs/ufs_extern.h
==============================================================================
--- stable/9/sys/ufs/ufs/ufs_extern.h Wed Mar 5 04:23:19 2014
(r262779)
+++ stable/9/sys/ufs/ufs/ufs_extern.h Wed Mar 5 04:27:15 2014
(r262780)
@@ -119,11 +119,11 @@ void softdep_revert_rmdir(struct inode *
* Note: The general vfs code typically limits the sequential heuristic
* count to 127. See sequential_heuristic() in kern/vfs_vnops.c
*/
-#define BA_CLRBUF 0x00010000 /* Clear invalid areas of buffer. */
-#define BA_METAONLY 0x00020000 /* Return indirect block buffer. */
+#define BA_CLRBUF 0x00010000 /* Clear invalid areas of
buffer. */
+#define BA_METAONLY 0x00020000 /* Return indirect block
buffer. */
#define BA_UNMAPPED 0x00040000 /* Do not mmap resulted buffer.
*/
-#define BA_SEQMASK 0x7F000000 /* Bits holding seq heuristic. */
-#define BA_SEQSHIFT 24
-#define BA_SEQMAX 0x7F
+#define BA_SEQMASK 0x7F000000 /* Bits holding seq heuristic.
*/
+#define BA_SEQSHIFT 24
+#define BA_SEQMAX 0x7F
#endif /* !_UFS_UFS_EXTERN_H_ */
Modified: stable/9/sys/ufs/ufs/ufsmount.h
==============================================================================
--- stable/9/sys/ufs/ufs/ufsmount.h Wed Mar 5 04:23:19 2014
(r262779)
+++ stable/9/sys/ufs/ufs/ufsmount.h Wed Mar 5 04:27:15 2014
(r262780)
@@ -31,7 +31,7 @@
*/
#ifndef _UFS_UFS_UFSMOUNT_H_
-#define _UFS_UFS_UFSMOUNT_H_
+#define _UFS_UFS_UFSMOUNT_H_
#include <sys/buf.h> /* XXX For struct workhead. */
@@ -127,25 +127,25 @@ struct ufsmount {
/*
* Filesystem types
*/
-#define UFS1 1
-#define UFS2 2
+#define UFS1 1
+#define UFS2 2
/*
* Flags describing the state of quotas.
*/
#define QTF_OPENING 0x01 /* Q_QUOTAON in
progress */
#define QTF_CLOSING 0x02 /* Q_QUOTAOFF in
progress */
-#define QTF_64BIT 0x04 /* 64-bit quota file */
+#define QTF_64BIT 0x04 /* 64-bit quota file */
/* Convert mount ptr to ufsmount ptr. */
-#define VFSTOUFS(mp) ((struct ufsmount *)((mp)->mnt_data))
+#define VFSTOUFS(mp) ((struct ufsmount *)((mp)->mnt_data))
#define UFSTOVFS(ump) (ump)->um_mountp
/*
* Macros to access filesystem parameters in the ufsmount structure.
* Used by ufs_bmap.
*/
-#define MNINDIR(ump) ((ump)->um_nindir)
+#define MNINDIR(ump) ((ump)->um_nindir)
#define blkptrtodb(ump, b) ((b) << (ump)->um_bptrtodb)
#define is_sequential(ump, a, b) ((b) == (a) + ump->um_seqinc)
#endif /* _KERNEL */
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
