From b4567e9c7982f62b90489955c287c839c1812928 Mon Sep 17 00:00:00 2001 From: Sam Leffler Date: Tue, 3 Aug 1982 21:02:38 -0800 Subject: [PATCH] cosmetics SCCS-vsn: sys/ufs/ffs/ffs_alloc.c 2.10 SCCS-vsn: sys/ufs/lfs/lfs_alloc.c 2.10 SCCS-vsn: sys/ufs/ffs/ffs_inode.c 4.22 SCCS-vsn: sys/ufs/ffs/ufs_inode.c 4.22 SCCS-vsn: sys/ufs/lfs/lfs_inode.c 4.22 SCCS-vsn: sys/ufs/ufs/ufs_inode.c 4.22 --- usr/src/sys/ufs/ffs/ffs_alloc.c | 8 +++---- usr/src/sys/ufs/ffs/ffs_inode.c | 38 ++++++++++++++++----------------- usr/src/sys/ufs/ffs/ufs_inode.c | 38 ++++++++++++++++----------------- usr/src/sys/ufs/lfs/lfs_alloc.c | 8 +++---- usr/src/sys/ufs/lfs/lfs_inode.c | 38 ++++++++++++++++----------------- usr/src/sys/ufs/ufs/ufs_inode.c | 38 ++++++++++++++++----------------- 6 files changed, 84 insertions(+), 84 deletions(-) diff --git a/usr/src/sys/ufs/ffs/ffs_alloc.c b/usr/src/sys/ufs/ffs/ffs_alloc.c index 9e8e6b106d..bd99cfa122 100644 --- a/usr/src/sys/ufs/ffs/ffs_alloc.c +++ b/usr/src/sys/ufs/ffs/ffs_alloc.c @@ -1,4 +1,4 @@ -/* ffs_alloc.c 2.9 82/07/22 */ +/* ffs_alloc.c 2.10 82/08/03 */ #include "../h/param.h" #include "../h/systm.h" @@ -63,7 +63,7 @@ alloc(ip, bpref, size) fs->fs_cstotal.cs_nbfree * fs->fs_frag + fs->fs_cstotal.cs_nffree < fs->fs_dsize * fs->fs_minfree / 100) goto nospace; -#ifdef QUOTA +#ifdef QUOTA if (chkdq(ip, (long)((unsigned)size/DEV_BSIZE), 0)) return(NULL); #endif @@ -121,7 +121,7 @@ realloccg(ip, bprev, bpref, osize, nsize) ip->i_dev, fs->fs_bsize, bprev, fs->fs_fsmnt); panic("realloccg: bad bprev"); } -#ifdef QUOTA +#ifdef QUOTA if (chkdq(ip, (long)((unsigned)(nsize-osize)/DEV_BSIZE), 0)) return(NULL); #endif @@ -194,7 +194,7 @@ ialloc(pip, ipref, mode) fs = pip->i_fs; if (fs->fs_cstotal.cs_nifree == 0) goto noinodes; -#ifdef QUOTA +#ifdef QUOTA if (chkiq(pip->i_dev, NULL, u.u_uid, 0)) return(NULL); #endif diff --git a/usr/src/sys/ufs/ffs/ffs_inode.c b/usr/src/sys/ufs/ffs/ffs_inode.c index 4a93d64fe4..2ff2d157c0 100644 --- a/usr/src/sys/ufs/ffs/ffs_inode.c +++ b/usr/src/sys/ufs/ffs/ffs_inode.c @@ -1,4 +1,4 @@ -/* ffs_inode.c 4.21 82/07/30 */ +/* ffs_inode.c 4.22 82/08/03 */ #include "../h/param.h" #include "../h/systm.h" @@ -10,7 +10,7 @@ #include "../h/conf.h" #include "../h/buf.h" #include "../h/inline.h" -#ifdef QUOTA +#ifdef QUOTA #include "../h/quota.h" #endif @@ -162,7 +162,7 @@ loop: */ remque(ip); insque(ip, ih); -#ifdef QUOTA +#ifdef QUOTA dqrele(ip->i_dquot); #endif ip->i_dev = dev; @@ -192,7 +192,7 @@ loop: * (probably the two methods are interchangable) */ ip->i_number = 0; -#ifdef QUOTA +#ifdef QUOTA ip->i_dquot = NODQUOT; #endif iput(ip); @@ -202,7 +202,7 @@ loop: dp += itoo(fs, ino); ip->i_ic = dp->di_ic; brelse(bp); -#ifdef QUOTA +#ifdef QUOTA if (ip->i_mode == 0) ip->i_dquot = NODQUOT; else @@ -244,7 +244,7 @@ irele(ip) ip->i_rdev = 0; ip->i_flag |= IUPD|ICHG; ifree(ip, ip->i_number, mode); -#ifdef QUOTA +#ifdef QUOTA chkiq(ip->i_dev, ip, ip->i_uid, 0); dqrele(ip->i_dquot); ip->i_dquot = NODQUOT; @@ -333,7 +333,7 @@ itrunc(ip) daddr_t bn; struct inode itmp; register struct fs *fs; -#ifdef QUOTA +#ifdef QUOTA register long cnt = 0; long tloop(); #endif @@ -371,7 +371,7 @@ itrunc(ip) bn = ip->i_ib[NIADDR-1]; if (bn != (daddr_t)0) { ip->i_ib[NIADDR - 1] = (daddr_t)0; -#ifdef QUOTA +#ifdef QUOTA cnt += #endif tloop(ip, bn, 1); @@ -383,7 +383,7 @@ itrunc(ip) bn = ip->i_ib[i]; if (bn != (daddr_t)0) { ip->i_ib[i] = (daddr_t)0; -#ifdef QUOTA +#ifdef QUOTA cnt += #endif tloop(ip, bn, 0); @@ -400,7 +400,7 @@ itrunc(ip) continue; ip->i_db[i] = (daddr_t)0; fre(ip, bn, size = (off_t)blksize(fs, ip, i)); -#ifdef QUOTA +#ifdef QUOTA cnt += size / DEV_BSIZE; #endif } @@ -409,12 +409,12 @@ itrunc(ip) * Inode was written and flags updated above. * No need to modify flags here. */ -#ifdef QUOTA +#ifdef QUOTA (void) chkdq(ip, -cnt, 0); #endif } -#ifdef QUOTA +#ifdef QUOTA long #endif tloop(ip, bn, indflg) @@ -427,7 +427,7 @@ tloop(ip, bn, indflg) register daddr_t *bap; register struct fs *fs; daddr_t nb; -#ifdef QUOTA +#ifdef QUOTA register long cnt = 0; #endif @@ -446,13 +446,13 @@ tloop(ip, bn, indflg) if (nb == (daddr_t)0) continue; if (indflg) { -#ifdef QUOTA +#ifdef QUOTA cnt += #endif tloop(ip, nb, 0); } else { fre(ip, nb, fs->fs_bsize); -#ifdef QUOTA +#ifdef QUOTA cnt += fs->fs_bsize / DEV_BSIZE; #endif } @@ -460,7 +460,7 @@ tloop(ip, bn, indflg) if (bp != NULL) brelse(bp); fre(ip, bn, fs->fs_bsize); -#ifdef QUOTA +#ifdef QUOTA cnt += fs->fs_bsize / DEV_BSIZE; return(cnt); #endif @@ -479,7 +479,7 @@ tloop(ip, bn, indflg) * * this is called from sumount()/sys3.c when dev is being unmounted */ -#ifdef QUOTA +#ifdef QUOTA iflush(dev, iq) dev_t dev; struct inode *iq; @@ -492,7 +492,7 @@ iflush(dev) register open = 0; for (ip = inode; ip < inodeNINODE; ip++) { -#ifdef QUOTA +#ifdef QUOTA if (ip != iq && ip->i_dev == dev) #else if (ip->i_dev == dev) @@ -512,7 +512,7 @@ iflush(dev) * infrequently, we would gain very little, * while making the code bigger. */ -#ifdef QUOTA +#ifdef QUOTA dqrele(ip->i_dquot); ip->i_dquot = NODQUOT; #endif diff --git a/usr/src/sys/ufs/ffs/ufs_inode.c b/usr/src/sys/ufs/ffs/ufs_inode.c index c78c170925..6282d7dc4a 100644 --- a/usr/src/sys/ufs/ffs/ufs_inode.c +++ b/usr/src/sys/ufs/ffs/ufs_inode.c @@ -1,4 +1,4 @@ -/* ufs_inode.c 4.21 82/07/30 */ +/* ufs_inode.c 4.22 82/08/03 */ #include "../h/param.h" #include "../h/systm.h" @@ -10,7 +10,7 @@ #include "../h/conf.h" #include "../h/buf.h" #include "../h/inline.h" -#ifdef QUOTA +#ifdef QUOTA #include "../h/quota.h" #endif @@ -162,7 +162,7 @@ loop: */ remque(ip); insque(ip, ih); -#ifdef QUOTA +#ifdef QUOTA dqrele(ip->i_dquot); #endif ip->i_dev = dev; @@ -192,7 +192,7 @@ loop: * (probably the two methods are interchangable) */ ip->i_number = 0; -#ifdef QUOTA +#ifdef QUOTA ip->i_dquot = NODQUOT; #endif iput(ip); @@ -202,7 +202,7 @@ loop: dp += itoo(fs, ino); ip->i_ic = dp->di_ic; brelse(bp); -#ifdef QUOTA +#ifdef QUOTA if (ip->i_mode == 0) ip->i_dquot = NODQUOT; else @@ -244,7 +244,7 @@ irele(ip) ip->i_rdev = 0; ip->i_flag |= IUPD|ICHG; ifree(ip, ip->i_number, mode); -#ifdef QUOTA +#ifdef QUOTA chkiq(ip->i_dev, ip, ip->i_uid, 0); dqrele(ip->i_dquot); ip->i_dquot = NODQUOT; @@ -333,7 +333,7 @@ itrunc(ip) daddr_t bn; struct inode itmp; register struct fs *fs; -#ifdef QUOTA +#ifdef QUOTA register long cnt = 0; long tloop(); #endif @@ -371,7 +371,7 @@ itrunc(ip) bn = ip->i_ib[NIADDR-1]; if (bn != (daddr_t)0) { ip->i_ib[NIADDR - 1] = (daddr_t)0; -#ifdef QUOTA +#ifdef QUOTA cnt += #endif tloop(ip, bn, 1); @@ -383,7 +383,7 @@ itrunc(ip) bn = ip->i_ib[i]; if (bn != (daddr_t)0) { ip->i_ib[i] = (daddr_t)0; -#ifdef QUOTA +#ifdef QUOTA cnt += #endif tloop(ip, bn, 0); @@ -400,7 +400,7 @@ itrunc(ip) continue; ip->i_db[i] = (daddr_t)0; fre(ip, bn, size = (off_t)blksize(fs, ip, i)); -#ifdef QUOTA +#ifdef QUOTA cnt += size / DEV_BSIZE; #endif } @@ -409,12 +409,12 @@ itrunc(ip) * Inode was written and flags updated above. * No need to modify flags here. */ -#ifdef QUOTA +#ifdef QUOTA (void) chkdq(ip, -cnt, 0); #endif } -#ifdef QUOTA +#ifdef QUOTA long #endif tloop(ip, bn, indflg) @@ -427,7 +427,7 @@ tloop(ip, bn, indflg) register daddr_t *bap; register struct fs *fs; daddr_t nb; -#ifdef QUOTA +#ifdef QUOTA register long cnt = 0; #endif @@ -446,13 +446,13 @@ tloop(ip, bn, indflg) if (nb == (daddr_t)0) continue; if (indflg) { -#ifdef QUOTA +#ifdef QUOTA cnt += #endif tloop(ip, nb, 0); } else { fre(ip, nb, fs->fs_bsize); -#ifdef QUOTA +#ifdef QUOTA cnt += fs->fs_bsize / DEV_BSIZE; #endif } @@ -460,7 +460,7 @@ tloop(ip, bn, indflg) if (bp != NULL) brelse(bp); fre(ip, bn, fs->fs_bsize); -#ifdef QUOTA +#ifdef QUOTA cnt += fs->fs_bsize / DEV_BSIZE; return(cnt); #endif @@ -479,7 +479,7 @@ tloop(ip, bn, indflg) * * this is called from sumount()/sys3.c when dev is being unmounted */ -#ifdef QUOTA +#ifdef QUOTA iflush(dev, iq) dev_t dev; struct inode *iq; @@ -492,7 +492,7 @@ iflush(dev) register open = 0; for (ip = inode; ip < inodeNINODE; ip++) { -#ifdef QUOTA +#ifdef QUOTA if (ip != iq && ip->i_dev == dev) #else if (ip->i_dev == dev) @@ -512,7 +512,7 @@ iflush(dev) * infrequently, we would gain very little, * while making the code bigger. */ -#ifdef QUOTA +#ifdef QUOTA dqrele(ip->i_dquot); ip->i_dquot = NODQUOT; #endif diff --git a/usr/src/sys/ufs/lfs/lfs_alloc.c b/usr/src/sys/ufs/lfs/lfs_alloc.c index 3eb28c77aa..35e1302e34 100644 --- a/usr/src/sys/ufs/lfs/lfs_alloc.c +++ b/usr/src/sys/ufs/lfs/lfs_alloc.c @@ -1,4 +1,4 @@ -/* lfs_alloc.c 2.9 82/07/22 */ +/* lfs_alloc.c 2.10 82/08/03 */ #include "../h/param.h" #include "../h/systm.h" @@ -63,7 +63,7 @@ alloc(ip, bpref, size) fs->fs_cstotal.cs_nbfree * fs->fs_frag + fs->fs_cstotal.cs_nffree < fs->fs_dsize * fs->fs_minfree / 100) goto nospace; -#ifdef QUOTA +#ifdef QUOTA if (chkdq(ip, (long)((unsigned)size/DEV_BSIZE), 0)) return(NULL); #endif @@ -121,7 +121,7 @@ realloccg(ip, bprev, bpref, osize, nsize) ip->i_dev, fs->fs_bsize, bprev, fs->fs_fsmnt); panic("realloccg: bad bprev"); } -#ifdef QUOTA +#ifdef QUOTA if (chkdq(ip, (long)((unsigned)(nsize-osize)/DEV_BSIZE), 0)) return(NULL); #endif @@ -194,7 +194,7 @@ ialloc(pip, ipref, mode) fs = pip->i_fs; if (fs->fs_cstotal.cs_nifree == 0) goto noinodes; -#ifdef QUOTA +#ifdef QUOTA if (chkiq(pip->i_dev, NULL, u.u_uid, 0)) return(NULL); #endif diff --git a/usr/src/sys/ufs/lfs/lfs_inode.c b/usr/src/sys/ufs/lfs/lfs_inode.c index f33118e8fb..11f3fc1f94 100644 --- a/usr/src/sys/ufs/lfs/lfs_inode.c +++ b/usr/src/sys/ufs/lfs/lfs_inode.c @@ -1,4 +1,4 @@ -/* lfs_inode.c 4.21 82/07/30 */ +/* lfs_inode.c 4.22 82/08/03 */ #include "../h/param.h" #include "../h/systm.h" @@ -10,7 +10,7 @@ #include "../h/conf.h" #include "../h/buf.h" #include "../h/inline.h" -#ifdef QUOTA +#ifdef QUOTA #include "../h/quota.h" #endif @@ -162,7 +162,7 @@ loop: */ remque(ip); insque(ip, ih); -#ifdef QUOTA +#ifdef QUOTA dqrele(ip->i_dquot); #endif ip->i_dev = dev; @@ -192,7 +192,7 @@ loop: * (probably the two methods are interchangable) */ ip->i_number = 0; -#ifdef QUOTA +#ifdef QUOTA ip->i_dquot = NODQUOT; #endif iput(ip); @@ -202,7 +202,7 @@ loop: dp += itoo(fs, ino); ip->i_ic = dp->di_ic; brelse(bp); -#ifdef QUOTA +#ifdef QUOTA if (ip->i_mode == 0) ip->i_dquot = NODQUOT; else @@ -244,7 +244,7 @@ irele(ip) ip->i_rdev = 0; ip->i_flag |= IUPD|ICHG; ifree(ip, ip->i_number, mode); -#ifdef QUOTA +#ifdef QUOTA chkiq(ip->i_dev, ip, ip->i_uid, 0); dqrele(ip->i_dquot); ip->i_dquot = NODQUOT; @@ -333,7 +333,7 @@ itrunc(ip) daddr_t bn; struct inode itmp; register struct fs *fs; -#ifdef QUOTA +#ifdef QUOTA register long cnt = 0; long tloop(); #endif @@ -371,7 +371,7 @@ itrunc(ip) bn = ip->i_ib[NIADDR-1]; if (bn != (daddr_t)0) { ip->i_ib[NIADDR - 1] = (daddr_t)0; -#ifdef QUOTA +#ifdef QUOTA cnt += #endif tloop(ip, bn, 1); @@ -383,7 +383,7 @@ itrunc(ip) bn = ip->i_ib[i]; if (bn != (daddr_t)0) { ip->i_ib[i] = (daddr_t)0; -#ifdef QUOTA +#ifdef QUOTA cnt += #endif tloop(ip, bn, 0); @@ -400,7 +400,7 @@ itrunc(ip) continue; ip->i_db[i] = (daddr_t)0; fre(ip, bn, size = (off_t)blksize(fs, ip, i)); -#ifdef QUOTA +#ifdef QUOTA cnt += size / DEV_BSIZE; #endif } @@ -409,12 +409,12 @@ itrunc(ip) * Inode was written and flags updated above. * No need to modify flags here. */ -#ifdef QUOTA +#ifdef QUOTA (void) chkdq(ip, -cnt, 0); #endif } -#ifdef QUOTA +#ifdef QUOTA long #endif tloop(ip, bn, indflg) @@ -427,7 +427,7 @@ tloop(ip, bn, indflg) register daddr_t *bap; register struct fs *fs; daddr_t nb; -#ifdef QUOTA +#ifdef QUOTA register long cnt = 0; #endif @@ -446,13 +446,13 @@ tloop(ip, bn, indflg) if (nb == (daddr_t)0) continue; if (indflg) { -#ifdef QUOTA +#ifdef QUOTA cnt += #endif tloop(ip, nb, 0); } else { fre(ip, nb, fs->fs_bsize); -#ifdef QUOTA +#ifdef QUOTA cnt += fs->fs_bsize / DEV_BSIZE; #endif } @@ -460,7 +460,7 @@ tloop(ip, bn, indflg) if (bp != NULL) brelse(bp); fre(ip, bn, fs->fs_bsize); -#ifdef QUOTA +#ifdef QUOTA cnt += fs->fs_bsize / DEV_BSIZE; return(cnt); #endif @@ -479,7 +479,7 @@ tloop(ip, bn, indflg) * * this is called from sumount()/sys3.c when dev is being unmounted */ -#ifdef QUOTA +#ifdef QUOTA iflush(dev, iq) dev_t dev; struct inode *iq; @@ -492,7 +492,7 @@ iflush(dev) register open = 0; for (ip = inode; ip < inodeNINODE; ip++) { -#ifdef QUOTA +#ifdef QUOTA if (ip != iq && ip->i_dev == dev) #else if (ip->i_dev == dev) @@ -512,7 +512,7 @@ iflush(dev) * infrequently, we would gain very little, * while making the code bigger. */ -#ifdef QUOTA +#ifdef QUOTA dqrele(ip->i_dquot); ip->i_dquot = NODQUOT; #endif diff --git a/usr/src/sys/ufs/ufs/ufs_inode.c b/usr/src/sys/ufs/ufs/ufs_inode.c index c78c170925..6282d7dc4a 100644 --- a/usr/src/sys/ufs/ufs/ufs_inode.c +++ b/usr/src/sys/ufs/ufs/ufs_inode.c @@ -1,4 +1,4 @@ -/* ufs_inode.c 4.21 82/07/30 */ +/* ufs_inode.c 4.22 82/08/03 */ #include "../h/param.h" #include "../h/systm.h" @@ -10,7 +10,7 @@ #include "../h/conf.h" #include "../h/buf.h" #include "../h/inline.h" -#ifdef QUOTA +#ifdef QUOTA #include "../h/quota.h" #endif @@ -162,7 +162,7 @@ loop: */ remque(ip); insque(ip, ih); -#ifdef QUOTA +#ifdef QUOTA dqrele(ip->i_dquot); #endif ip->i_dev = dev; @@ -192,7 +192,7 @@ loop: * (probably the two methods are interchangable) */ ip->i_number = 0; -#ifdef QUOTA +#ifdef QUOTA ip->i_dquot = NODQUOT; #endif iput(ip); @@ -202,7 +202,7 @@ loop: dp += itoo(fs, ino); ip->i_ic = dp->di_ic; brelse(bp); -#ifdef QUOTA +#ifdef QUOTA if (ip->i_mode == 0) ip->i_dquot = NODQUOT; else @@ -244,7 +244,7 @@ irele(ip) ip->i_rdev = 0; ip->i_flag |= IUPD|ICHG; ifree(ip, ip->i_number, mode); -#ifdef QUOTA +#ifdef QUOTA chkiq(ip->i_dev, ip, ip->i_uid, 0); dqrele(ip->i_dquot); ip->i_dquot = NODQUOT; @@ -333,7 +333,7 @@ itrunc(ip) daddr_t bn; struct inode itmp; register struct fs *fs; -#ifdef QUOTA +#ifdef QUOTA register long cnt = 0; long tloop(); #endif @@ -371,7 +371,7 @@ itrunc(ip) bn = ip->i_ib[NIADDR-1]; if (bn != (daddr_t)0) { ip->i_ib[NIADDR - 1] = (daddr_t)0; -#ifdef QUOTA +#ifdef QUOTA cnt += #endif tloop(ip, bn, 1); @@ -383,7 +383,7 @@ itrunc(ip) bn = ip->i_ib[i]; if (bn != (daddr_t)0) { ip->i_ib[i] = (daddr_t)0; -#ifdef QUOTA +#ifdef QUOTA cnt += #endif tloop(ip, bn, 0); @@ -400,7 +400,7 @@ itrunc(ip) continue; ip->i_db[i] = (daddr_t)0; fre(ip, bn, size = (off_t)blksize(fs, ip, i)); -#ifdef QUOTA +#ifdef QUOTA cnt += size / DEV_BSIZE; #endif } @@ -409,12 +409,12 @@ itrunc(ip) * Inode was written and flags updated above. * No need to modify flags here. */ -#ifdef QUOTA +#ifdef QUOTA (void) chkdq(ip, -cnt, 0); #endif } -#ifdef QUOTA +#ifdef QUOTA long #endif tloop(ip, bn, indflg) @@ -427,7 +427,7 @@ tloop(ip, bn, indflg) register daddr_t *bap; register struct fs *fs; daddr_t nb; -#ifdef QUOTA +#ifdef QUOTA register long cnt = 0; #endif @@ -446,13 +446,13 @@ tloop(ip, bn, indflg) if (nb == (daddr_t)0) continue; if (indflg) { -#ifdef QUOTA +#ifdef QUOTA cnt += #endif tloop(ip, nb, 0); } else { fre(ip, nb, fs->fs_bsize); -#ifdef QUOTA +#ifdef QUOTA cnt += fs->fs_bsize / DEV_BSIZE; #endif } @@ -460,7 +460,7 @@ tloop(ip, bn, indflg) if (bp != NULL) brelse(bp); fre(ip, bn, fs->fs_bsize); -#ifdef QUOTA +#ifdef QUOTA cnt += fs->fs_bsize / DEV_BSIZE; return(cnt); #endif @@ -479,7 +479,7 @@ tloop(ip, bn, indflg) * * this is called from sumount()/sys3.c when dev is being unmounted */ -#ifdef QUOTA +#ifdef QUOTA iflush(dev, iq) dev_t dev; struct inode *iq; @@ -492,7 +492,7 @@ iflush(dev) register open = 0; for (ip = inode; ip < inodeNINODE; ip++) { -#ifdef QUOTA +#ifdef QUOTA if (ip != iq && ip->i_dev == dev) #else if (ip->i_dev == dev) @@ -512,7 +512,7 @@ iflush(dev) * infrequently, we would gain very little, * while making the code bigger. */ -#ifdef QUOTA +#ifdef QUOTA dqrele(ip->i_dquot); ip->i_dquot = NODQUOT; #endif -- 2.20.1