diff options
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ffs/ffs_balloc.c | 16 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_inode.c | 6 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 26 | ||||
| -rw-r--r-- | sys/ufs/mfs/mfs_vfsops.c | 8 | ||||
| -rw-r--r-- | sys/ufs/mfs/mfs_vnops.c | 6 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_bmap.c | 4 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_lookup.c | 10 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_readwrite.c | 6 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_vfsops.c | 4 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_vnops.c | 22 |
10 files changed, 54 insertions, 54 deletions
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c index 6153766..2410b92 100644 --- a/sys/ufs/ffs/ffs_balloc.c +++ b/sys/ufs/ffs/ffs_balloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_balloc.c 8.8 (Berkeley) 6/16/95 - * $Id: ffs_balloc.c,v 1.20 1998/03/08 09:58:47 julian Exp $ + * $Id: ffs_balloc.c,v 1.21 1998/09/12 14:46:15 bde Exp $ */ #include <sys/param.h> @@ -184,7 +184,7 @@ ffs_balloc(ap) * Determine the number of levels of indirection. */ pref = 0; - if (error = ufs_getlbns(vp, lbn, indirs, &num)) + if ((error = ufs_getlbns(vp, lbn, indirs, &num)) != 0) return(error); #ifdef DIAGNOSTIC if (num < 1) @@ -199,8 +199,8 @@ ffs_balloc(ap) allocblk = allociblk; if (nb == 0) { pref = ffs_blkpref(ip, lbn, 0, (ufs_daddr_t *)0); - if (error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, - cred, &newb)) + if ((error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, + cred, &newb)) != 0) return (error); nb = newb; *allocblk++ = nb; @@ -216,7 +216,7 @@ ffs_balloc(ap) * Write synchronously so that indirect blocks * never point at garbage. */ - if (error = bwrite(bp)) + if ((error = bwrite(bp)) != 0) goto fail; } allocib = &ip->i_ib[indirs[0].in_off]; @@ -244,8 +244,8 @@ ffs_balloc(ap) } if (pref == 0) pref = ffs_blkpref(ip, lbn, 0, (ufs_daddr_t *)0); - if (error = - ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, cred, &newb)) { + if ((error = + ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, cred, &newb)) != 0) { brelse(bp); goto fail; } @@ -263,7 +263,7 @@ ffs_balloc(ap) * Write synchronously so that indirect blocks * never point at garbage. */ - if (error = bwrite(nbp)) { + if ((error = bwrite(nbp)) != 0) { brelse(bp); goto fail; } diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index b474bc5..8821440 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_inode.c 8.13 (Berkeley) 4/21/95 - * $Id: ffs_inode.c,v 1.51 1999/01/06 18:18:06 bde Exp $ + * $Id: ffs_inode.c,v 1.52 1999/01/07 16:14:16 bde Exp $ */ #include "opt_quota.h" @@ -490,8 +490,8 @@ ffs_indirtrunc(ip, lbn, dbn, lastbn, level, countp) if (nb == 0) continue; if (level > SINGLE) { - if (error = ffs_indirtrunc(ip, nlbn, fsbtodb(fs, nb), - (ufs_daddr_t)-1, level - 1, &blkcount)) + if ((error = ffs_indirtrunc(ip, nlbn, fsbtodb(fs, nb), + (ufs_daddr_t)-1, level - 1, &blkcount)) != 0) allerror = error; blocksreleased += blkcount; } diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 2973703..cffe980 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 - * $Id: ffs_vfsops.c,v 1.94 1999/01/05 18:50:03 eivind Exp $ + * $Id: ffs_vfsops.c,v 1.95 1999/01/07 16:14:17 bde Exp $ */ #include "opt_quota.h" @@ -221,8 +221,8 @@ ffs_mount( mp, path, data, ndp, p) */ if (p->p_ucred->cr_uid != 0) { vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p); - if (error = VOP_ACCESS(devvp, VREAD | VWRITE, - p->p_ucred, p)) { + if ((error = VOP_ACCESS(devvp, VREAD | VWRITE, + p->p_ucred, p)) != 0) { VOP_UNLOCK(devvp, 0, p); return (error); } @@ -305,7 +305,7 @@ ffs_mount( mp, path, data, ndp, p) if ((mp->mnt_flag & MNT_RDONLY) == 0) accessmode |= VWRITE; vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p); - if (error = VOP_ACCESS(devvp, accessmode, p->p_ucred, p)) { + if ((error = VOP_ACCESS(devvp, accessmode, p->p_ucred, p)) != 0) { vput(devvp); return (error); } @@ -472,7 +472,7 @@ ffs_reload(mp, cred, p) size = DEV_BSIZE; else size = dpart.disklab->d_secsize; - if (error = bread(devvp, (ufs_daddr_t)(SBOFF/size), SBSIZE, NOCRED,&bp)) + if ((error = bread(devvp, (ufs_daddr_t)(SBOFF/size), SBSIZE, NOCRED,&bp)) != 0) return (error); newfs = (struct fs *)bp->b_data; if (newfs->fs_magic != FS_MAGIC || newfs->fs_bsize > MAXBSIZE || @@ -634,7 +634,7 @@ ffs_mountfs(devvp, mp, p, malloctype) bp = NULL; ump = NULL; - if (error = bread(devvp, SBLOCK, SBSIZE, cred, &bp)) + if ((error = bread(devvp, SBLOCK, SBSIZE, cred, &bp)) != 0) goto out; fs = (struct fs *)bp->b_data; if (fs->fs_magic != FS_MAGIC || fs->fs_bsize > MAXBSIZE || @@ -693,8 +693,8 @@ ffs_mountfs(devvp, mp, p, malloctype) size = fs->fs_bsize; if (i + fs->fs_frag > blks) size = (blks - i) * fs->fs_fsize; - if (error = bread(devvp, fsbtodb(fs, fs->fs_csaddr + i), size, - cred, &bp)) { + if ((error = bread(devvp, fsbtodb(fs, fs->fs_csaddr + i), size, + cred, &bp)) != 0) { free(base, M_UFSMNT); goto out; } @@ -973,9 +973,9 @@ loop: simple_lock(&vp->v_interlock); nvp = vp->v_mntvnodes.le_next; ip = VTOI(vp); - if ((vp->v_type == VNON) || ((ip->i_flag & + if ((vp->v_type == VNON) || (((ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0) && - (TAILQ_EMPTY(&vp->v_dirtyblkhd) || (waitfor == MNT_LAZY))) { + (TAILQ_EMPTY(&vp->v_dirtyblkhd) || (waitfor == MNT_LAZY)))) { simple_unlock(&vp->v_interlock); continue; } @@ -989,7 +989,7 @@ loop: goto loop; continue; } - if (error = VOP_FSYNC(vp, cred, waitfor, p)) + if ((error = VOP_FSYNC(vp, cred, waitfor, p)) != 0) allerror = error; VOP_UNLOCK(vp, 0, p); vrele(vp); @@ -1264,7 +1264,7 @@ ffs_sbupdate(mp, waitfor) space += size; if (waitfor != MNT_WAIT) bawrite(bp); - else if (error = bwrite(bp)) + else if ((error = bwrite(bp)) != 0) allerror = error; } /* @@ -1294,7 +1294,7 @@ ffs_sbupdate(mp, waitfor) dfs->fs_maxfilesize = mp->um_savedmaxfilesize; /* XXX */ if (waitfor != MNT_WAIT) bawrite(bp); - else if (error = bwrite(bp)) + else if ((error = bwrite(bp)) != 0) allerror = error; return (allerror); } diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c index 6333cca..2bbacd9 100644 --- a/sys/ufs/mfs/mfs_vfsops.c +++ b/sys/ufs/mfs/mfs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfs_vfsops.c 8.11 (Berkeley) 6/19/95 - * $Id: mfs_vfsops.c,v 1.54 1999/01/21 08:29:08 dillon Exp $ + * $Id: mfs_vfsops.c,v 1.55 1999/01/21 09:24:46 dillon Exp $ */ @@ -260,7 +260,7 @@ mfs_mount(mp, path, data, ndp, p) */ /* copy in user arguments*/ - if (err = copyin(data, (caddr_t)&args, sizeof (struct mfs_args))) + if ((err = copyin(data, (caddr_t)&args, sizeof (struct mfs_args))) != 0) goto error_1; /* @@ -343,7 +343,7 @@ mfs_mount(mp, path, data, ndp, p) &size); /* real size*/ bzero( mp->mnt_stat.f_mntfromname + size, MNAMELEN - size); - if (err = ffs_mountfs(devvp, mp, p, M_MFSNODE)) { + if ((err = ffs_mountfs(devvp, mp, p, M_MFSNODE)) != 0) { mfsp->mfs_active = 0; goto error_2; } @@ -409,7 +409,7 @@ mfs_start(mp, flags, p) s = splbio(); - while (bp = bufq_first(&mfsp->buf_queue)) { + while ((bp = bufq_first(&mfsp->buf_queue)) != NULL) { bufq_remove(&mfsp->buf_queue, bp); splx(s); mfs_doio(bp, mfsp); diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c index 4b5ff20..15fad13 100644 --- a/sys/ufs/mfs/mfs_vnops.c +++ b/sys/ufs/mfs/mfs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfs_vnops.c 8.11 (Berkeley) 5/22/95 - * $Id: mfs_vnops.c,v 1.40 1999/01/21 09:27:03 dillon Exp $ + * $Id: mfs_vnops.c,v 1.41 1999/01/27 18:19:52 dillon Exp $ */ #include <sys/param.h> @@ -320,7 +320,7 @@ mfs_close(ap) /* * Finish any pending I/O requests. */ - while (bp = bufq_first(&mfsp->buf_queue)) { + while ((bp = bufq_first(&mfsp->buf_queue)) != NULL) { bufq_remove(&mfsp->buf_queue, bp); mfs_doio(bp, mfsp); wakeup((caddr_t)bp); @@ -330,7 +330,7 @@ mfs_close(ap) * we must invalidate any in core blocks, so that * we can, free up its vnode. */ - if (error = vinvalbuf(vp, 1, ap->a_cred, ap->a_p, 0, 0)) + if ((error = vinvalbuf(vp, 1, ap->a_cred, ap->a_p, 0, 0)) != 0) return (error); /* * There should be no way to have any more uses of this diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index 8d23b7e..f40ff33 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95 - * $Id: ufs_bmap.c,v 1.23 1998/10/26 08:53:13 bde Exp $ + * $Id: ufs_bmap.c,v 1.24 1998/10/27 11:47:08 bde Exp $ */ #include <sys/param.h> @@ -121,7 +121,7 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp, runb) mp = vp->v_mount; ump = VFSTOUFS(mp); #ifdef DIAGNOSTIC - if (ap != NULL && nump == NULL || ap == NULL && nump != NULL) + if ((ap != NULL && nump == NULL) || (ap == NULL && nump != NULL)) panic("ufs_bmaparray: invalid arguments"); #endif diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c index bd5e96f..44d33a8 100644 --- a/sys/ufs/ufs/ufs_lookup.c +++ b/sys/ufs/ufs/ufs_lookup.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_lookup.c 8.15 (Berkeley) 6/16/95 - * $Id: ufs_lookup.c,v 1.25 1998/07/11 07:46:07 bde Exp $ + * $Id: ufs_lookup.c,v 1.26 1999/01/07 16:14:18 bde Exp $ */ #include <sys/param.h> @@ -481,7 +481,7 @@ found: * regular file, or empty directory. */ if (nameiop == RENAME && wantparent && (flags & ISLASTCN)) { - if (error = VOP_ACCESS(vdp, VWRITE, cred, cnp->cn_proc)) + if ((error = VOP_ACCESS(vdp, VWRITE, cred, cnp->cn_proc)) != 0) return (error); /* * Careful about locking second inode. @@ -521,7 +521,7 @@ found: pdp = vdp; if (flags & ISDOTDOT) { VOP_UNLOCK(pdp, 0, p); /* race to get the inode */ - if (error = VFS_VGET(vdp->v_mount, dp->i_ino, &tdp)) { + if ((error = VFS_VGET(vdp->v_mount, dp->i_ino, &tdp)) != 0) { vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY, p); return (error); } @@ -861,8 +861,8 @@ ufs_dirremove(dvp, ip, flags, isrmdir) /* * Whiteout entry: set d_ino to WINO. */ - if (error = - UFS_BLKATOFF(dvp, (off_t)dp->i_offset, (char **)&ep, &bp)) + if ((error = + UFS_BLKATOFF(dvp, (off_t)dp->i_offset, (char **)&ep, &bp)) != 0) return (error); ep->d_ino = WINO; ep->d_type = DT_WHT; diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c index fd3555a..368608b 100644 --- a/sys/ufs/ufs/ufs_readwrite.c +++ b/sys/ufs/ufs/ufs_readwrite.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufs_readwrite.c 8.11 (Berkeley) 5/8/95 - * $Id: ufs_readwrite.c,v 1.55 1999/01/07 16:14:19 bde Exp $ + * $Id: ufs_readwrite.c,v 1.56 1999/01/21 08:29:09 dillon Exp $ */ #define BLKSIZE(a, b, c) blksize(a, b, c) @@ -564,8 +564,8 @@ ffs_getpages(ap) if (firstindex == 0) vp->v_lastr = 0; - if ((obj->behavior != OBJ_RANDOM) && - ((firstindex != 0) && (firstindex <= vp->v_lastr) && + if (((obj->behavior != OBJ_RANDOM) && + (firstindex != 0) && (firstindex <= vp->v_lastr) && ((firstindex + pcount) > vp->v_lastr)) || (obj->behavior == OBJ_SEQUENTIAL)) { struct uio auio; diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c index 1ee2d38..bc683ad 100644 --- a/sys/ufs/ufs/ufs_vfsops.c +++ b/sys/ufs/ufs/ufs_vfsops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_vfsops.c 8.8 (Berkeley) 5/20/95 - * $Id: ufs_vfsops.c,v 1.11 1997/10/12 20:26:27 phk Exp $ + * $Id: ufs_vfsops.c,v 1.12 1998/11/10 09:16:28 peter Exp $ */ #include "opt_quota.h" @@ -115,7 +115,7 @@ ufs_quotactl(mp, cmds, uid, arg, p) break; /* fall through */ default: - if (error = suser(p->p_ucred, &p->p_acflag)) + if ((error = suser(p->p_ucred, &p->p_acflag)) != 0) return (error); } diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 49e1a29..da20713 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95 - * $Id: ufs_vnops.c,v 1.104 1999/01/07 16:14:19 bde Exp $ + * $Id: ufs_vnops.c,v 1.105 1999/01/21 08:29:09 dillon Exp $ */ #include "opt_quota.h" @@ -310,7 +310,7 @@ ufs_access(ap) if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); #ifdef QUOTA - if (error = getinoquota(ip)) + if ((error = getinoquota(ip)) != 0) return (error); #endif break; @@ -469,7 +469,7 @@ ufs_setattr(ap) if (vap->va_uid != (uid_t)VNOVAL || vap->va_gid != (gid_t)VNOVAL) { if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); - if (error = ufs_chown(vp, vap->va_uid, vap->va_gid, cred, p)) + if ((error = ufs_chown(vp, vap->va_uid, vap->va_gid, cred, p)) != 0) return (error); } if (vap->va_size != VNOVAL) { @@ -489,7 +489,7 @@ ufs_setattr(ap) default: break; } - if (error = UFS_TRUNCATE(vp, vap->va_size, 0, cred, p)) + if ((error = UFS_TRUNCATE(vp, vap->va_size, 0, cred, p)) != 0) return (error); } ip = VTOI(vp); @@ -592,7 +592,7 @@ ufs_chown(vp, uid, gid, cred, p) ogid = ip->i_gid; ouid = ip->i_uid; #ifdef QUOTA - if (error = getinoquota(ip)) + if ((error = getinoquota(ip)) != 0) return (error); if (ouid == uid) { dqrele(vp, ip->i_dquot[USRQUOTA]); @@ -967,7 +967,7 @@ abortit: vput(fvp); return (error); } - if (error = vn_lock(fvp, LK_EXCLUSIVE, p)) + if ((error = vn_lock(fvp, LK_EXCLUSIVE, p)) != 0) goto abortit; dp = VTOI(fdvp); ip = VTOI(fvp); @@ -1015,7 +1015,7 @@ abortit: ip->i_flag |= IN_CHANGE; if (DOINGSOFTDEP(fvp)) softdep_increase_linkcnt(ip); - if (error = UFS_UPDATE(fvp, !DOINGSOFTDEP(fvp))) { + if ((error = UFS_UPDATE(fvp, !DOINGSOFTDEP(fvp))) != 0) { VOP_UNLOCK(fvp, 0, p); goto bad; } @@ -1817,7 +1817,7 @@ ufsspec_read(ap) * be accessed blindly here or in the other wrapper functions. */ ip = VTOI(ap->a_vp); - if (ip != NULL && (uio->uio_resid != resid || error == 0 && resid != 0)) + if (ip != NULL && (uio->uio_resid != resid || (error == 0 && resid != 0))) ip->i_flag |= IN_ACCESS; return (error); } @@ -1842,7 +1842,7 @@ ufsspec_write(ap) resid = uio->uio_resid; error = VOCALL(spec_vnodeop_p, VOFFSET(vop_write), ap); ip = VTOI(ap->a_vp); - if (ip != NULL && (uio->uio_resid != resid || error == 0 && resid != 0)) + if (ip != NULL && (uio->uio_resid != resid || (error == 0 && resid != 0))) VTOI(ap->a_vp)->i_flag |= IN_CHANGE | IN_UPDATE; return (error); } @@ -1891,7 +1891,7 @@ ufsfifo_read(ap) error = VOCALL(fifo_vnodeop_p, VOFFSET(vop_read), ap); ip = VTOI(ap->a_vp); if ((ap->a_vp->v_mount->mnt_flag & MNT_NOATIME) == 0 && ip != NULL && - (uio->uio_resid != resid || error == 0 && resid != 0)) + (uio->uio_resid != resid || (error == 0 && resid != 0))) VTOI(ap->a_vp)->i_flag |= IN_ACCESS; return (error); } @@ -1916,7 +1916,7 @@ ufsfifo_write(ap) resid = uio->uio_resid; error = VOCALL(fifo_vnodeop_p, VOFFSET(vop_write), ap); ip = VTOI(ap->a_vp); - if (ip != NULL && (uio->uio_resid != resid || error == 0 && resid != 0)) + if (ip != NULL && (uio->uio_resid != resid || (error == 0 && resid != 0))) VTOI(ap->a_vp)->i_flag |= IN_CHANGE | IN_UPDATE; return (error); } |
