diff options
author | pfg <pfg@FreeBSD.org> | 2014-03-02 02:52:34 +0000 |
---|---|---|
committer | pfg <pfg@FreeBSD.org> | 2014-03-02 02:52:34 +0000 |
commit | dc2809ceff07db5510254b09a7155d4f29822a2c (patch) | |
tree | 793f61862bcc06986dd42020c247358317a2dbc4 /sys/ufs/ufs | |
parent | b72229b01b608dd98668ae92ce401c02c6264805 (diff) | |
download | FreeBSD-src-dc2809ceff07db5510254b09a7155d4f29822a2c.zip FreeBSD-src-dc2809ceff07db5510254b09a7155d4f29822a2c.tar.gz |
ufs: small formatting fixes.
Cleanup some extra space.
Use of tabs vs. spaces.
No functional change.
MFC after: 3 days
Reviewed by: mckusick
Diffstat (limited to 'sys/ufs/ufs')
-rw-r--r-- | sys/ufs/ufs/dir.h | 12 | ||||
-rw-r--r-- | sys/ufs/ufs/dirhash.h | 22 | ||||
-rw-r--r-- | sys/ufs/ufs/extattr.h | 12 | ||||
-rw-r--r-- | sys/ufs/ufs/gjournal.h | 2 | ||||
-rw-r--r-- | sys/ufs/ufs/inode.h | 26 | ||||
-rw-r--r-- | sys/ufs/ufs/quota.h | 12 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_extern.h | 10 | ||||
-rw-r--r-- | sys/ufs/ufs/ufsmount.h | 26 |
8 files changed, 61 insertions, 61 deletions
diff --git a/sys/ufs/ufs/dir.h b/sys/ufs/ufs/dir.h index 62ee745..65f3ab1 100644 --- a/sys/ufs/ufs/dir.h +++ b/sys/ufs/ufs/dir.h @@ -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, diff --git a/sys/ufs/ufs/dirhash.h b/sys/ufs/ufs/dirhash.h index 91f6a17..4a53249 100644 --- a/sys/ufs/ufs/dirhash.h +++ b/sys/ufs/ufs/dirhash.h @@ -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 { diff --git a/sys/ufs/ufs/extattr.h b/sys/ufs/ufs/extattr.h index 7dd0235..1e5152c 100644 --- a/sys/ufs/ufs/extattr.h +++ b/sys/ufs/ufs/extattr.h @@ -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); \ @@ -148,7 +148,7 @@ void ufs_extattr_vnode_inactive(struct vnode *vp, struct thread *td); #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) diff --git a/sys/ufs/ufs/gjournal.h b/sys/ufs/ufs/gjournal.h index f4036b5..80f103b 100644 --- a/sys/ufs/ufs/gjournal.h +++ b/sys/ufs/ufs/gjournal.h @@ -27,7 +27,7 @@ */ #ifndef _UFS_UFS_GJOURNAL_H_ -#define _UFS_UFS_GJOURNAL_H_ +#define _UFS_UFS_GJOURNAL_H_ /* * GEOM journal function prototypes. diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h index 98ab1ed..37081d5 100644 --- a/sys/ufs/ufs/inode.h +++ b/sys/ufs/ufs/inode.h @@ -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 { diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h index 6d53bce..f0e24f0 100644 --- a/sys/ufs/ufs/quota.h +++ b/sys/ufs/ufs/quota.h @@ -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 */ diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h index 288eb62..e64faf1 100644 --- a/sys/ufs/ufs/ufs_extern.h +++ b/sys/ufs/ufs/ufs_extern.h @@ -117,11 +117,11 @@ void softdep_revert_rmdir(struct inode *, 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_ */ diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h index 958d24a..dfbc76f 100644 --- a/sys/ufs/ufs/ufsmount.h +++ b/sys/ufs/ufs/ufsmount.h @@ -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. */ @@ -98,13 +98,13 @@ struct ufsmount { void (*um_snapgone)(struct inode *); }; -#define UFS_BALLOC(aa, bb, cc, dd, ee, ff) VFSTOUFS((aa)->v_mount)->um_balloc(aa, bb, cc, dd, ee, ff) -#define UFS_BLKATOFF(aa, bb, cc, dd) VFSTOUFS((aa)->v_mount)->um_blkatoff(aa, bb, cc, dd) -#define UFS_TRUNCATE(aa, bb, cc, dd) VFSTOUFS((aa)->v_mount)->um_truncate(aa, bb, cc, dd) -#define UFS_UPDATE(aa, bb) VFSTOUFS((aa)->v_mount)->um_update(aa, bb) -#define UFS_VALLOC(aa, bb, cc, dd) VFSTOUFS((aa)->v_mount)->um_valloc(aa, bb, cc, dd) -#define UFS_VFREE(aa, bb, cc) VFSTOUFS((aa)->v_mount)->um_vfree(aa, bb, cc) -#define UFS_IFREE(aa, bb) ((aa)->um_ifree(aa, bb)) +#define UFS_BALLOC(aa, bb, cc, dd, ee, ff) VFSTOUFS((aa)->v_mount)->um_balloc(aa, bb, cc, dd, ee, ff) +#define UFS_BLKATOFF(aa, bb, cc, dd) VFSTOUFS((aa)->v_mount)->um_blkatoff(aa, bb, cc, dd) +#define UFS_TRUNCATE(aa, bb, cc, dd) VFSTOUFS((aa)->v_mount)->um_truncate(aa, bb, cc, dd) +#define UFS_UPDATE(aa, bb) VFSTOUFS((aa)->v_mount)->um_update(aa, bb) +#define UFS_VALLOC(aa, bb, cc, dd) VFSTOUFS((aa)->v_mount)->um_valloc(aa, bb, cc, dd) +#define UFS_VFREE(aa, bb, cc) VFSTOUFS((aa)->v_mount)->um_vfree(aa, bb, cc) +#define UFS_IFREE(aa, bb) ((aa)->um_ifree(aa, bb)) #define UFS_RDONLY(aa) ((aa)->i_ump->um_rdonly(aa)) #define UFS_SNAPGONE(aa) ((aa)->i_ump->um_snapgone(aa)) @@ -115,25 +115,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 */ |