diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs.h | 8 | ||||
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_alloc.c | 16 | ||||
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_balloc.c | 8 | ||||
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_bmap.c | 4 | ||||
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_dir.h | 4 | ||||
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_extern.h | 4 | ||||
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_inode.c | 10 | ||||
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_lookup.c | 26 | ||||
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_vfsops.c | 22 | ||||
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_vnops.c | 26 |
10 files changed, 64 insertions, 64 deletions
diff --git a/sys/ufs/ext2fs/ext2fs.h b/sys/ufs/ext2fs/ext2fs.h index 01e125fa384..523a15be69f 100644 --- a/sys/ufs/ext2fs/ext2fs.h +++ b/sys/ufs/ext2fs/ext2fs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs.h,v 1.15 2013/06/11 16:42:18 deraadt Exp $ */ +/* $OpenBSD: ext2fs.h,v 1.16 2014/05/27 14:31:24 krw Exp $ */ /* $NetBSD: ext2fs.h,v 1.10 2000/01/28 16:00:23 bouyer Exp $ */ /* @@ -311,12 +311,12 @@ void e2fs_cg_bswap(struct ext2_gd *, struct ext2_gd *, int); (((size) + (fs)->e2fs_qbmask) & (fs)->e2fs_bmask) #define fragroundup(fs, size) /* calculates roundup(size, fs->e2fs_bsize) */ \ (((size) + (fs)->e2fs_qbmask) & (fs)->e2fs_bmask) -/* +/* * Determine the number of available frags given a * percentage to hold in reserve. - */ + */ #define freespace(fs) \ - ((fs)->e2fs.e2fs_fbcount - (fs)->e2fs.e2fs_rbcount) + ((fs)->e2fs.e2fs_fbcount - (fs)->e2fs.e2fs_rbcount) /* * Number of indirects in a file system block. diff --git a/sys/ufs/ext2fs/ext2fs_alloc.c b/sys/ufs/ext2fs/ext2fs_alloc.c index 3c523f3d412..1fea6705444 100644 --- a/sys/ufs/ext2fs/ext2fs_alloc.c +++ b/sys/ufs/ext2fs/ext2fs_alloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_alloc.c,v 1.30 2013/12/12 19:00:09 tedu Exp $ */ +/* $OpenBSD: ext2fs_alloc.c,v 1.31 2014/05/27 14:31:24 krw Exp $ */ /* $NetBSD: ext2fs_alloc.c,v 1.10 2001/07/05 08:38:27 toshii Exp $ */ /* @@ -63,7 +63,7 @@ static int32_t ext2fs_mapsearch(struct m_ext2fs *, char *, int32_t); /* * Allocate a block in the file system. - * + * * A preference may be optionally specified. If a preference is given * the following hierarchy is used to allocate a block: * 1) allocate the requested block. @@ -85,7 +85,7 @@ ext2fs_alloc(struct inode *ip, int32_t lbn, int32_t bpref, struct m_ext2fs *fs; int32_t bno; int cg; - + *bnp = 0; fs = ip->i_e2fs; #ifdef DIAGNOSTIC @@ -118,7 +118,7 @@ nospace: /* * Allocate an inode in the file system. - * + * * If allocating a directory, use ext2fs_dirpref to select the inode. * If allocating in a directory, the following hierarchy is followed: * 1) allocate the preferred inode. @@ -140,7 +140,7 @@ ext2fs_inode_alloc(struct inode *pip, mode_t mode, struct ucred *cred, struct inode *ip; ufsino_t ino, ipref; int cg, error; - + *vpp = NULL; pvp = ITOV(pip); fs = pip->i_e2fs; @@ -211,7 +211,7 @@ ext2fs_dirpref(struct m_ext2fs *fs) * Select the desired position for the next block in a file. The file is * logically divided into sections. The first section is composed of the * direct blocks. Each additional section contains fs_maxbpg blocks. - * + * * If no blocks have been allocated in the first section, the policy is to * request a block in the same cylinder group as the inode that describes * the file. Otherwise, the policy is to try to allocate the blocks @@ -518,7 +518,7 @@ ext2fs_inode_free(struct inode *pip, ufsino_t ino, mode_t mode) panic("ifree: range: dev = 0x%x, ino = %d, fs = %s", pip->i_dev, ino, fs->e2fs_fsmnt); cg = ino_to_cg(fs, ino); - error = bread(pip->i_devvp, + error = bread(pip->i_devvp, fsbtodb(fs, fs->e2fs_gd[cg].ext2bgd_i_bitmap), (int)fs->e2fs_bsize, &bp); if (error) { @@ -592,7 +592,7 @@ ext2fs_mapsearch(struct m_ext2fs *fs, char *bbp, int32_t bpref) /* * Fserr prints the name of a file system with an error diagnostic. - * + * * The form of the error message is: * fs: error message */ diff --git a/sys/ufs/ext2fs/ext2fs_balloc.c b/sys/ufs/ext2fs/ext2fs_balloc.c index d9021187984..6d81503f77b 100644 --- a/sys/ufs/ext2fs/ext2fs_balloc.c +++ b/sys/ufs/ext2fs/ext2fs_balloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_balloc.c,v 1.19 2013/06/11 16:42:18 deraadt Exp $ */ +/* $OpenBSD: ext2fs_balloc.c,v 1.20 2014/05/27 14:31:24 krw Exp $ */ /* $NetBSD: ext2fs_balloc.c,v 1.10 2001/07/04 21:16:01 chs Exp $ */ /* @@ -56,7 +56,7 @@ * the inode and the logical block number in a file. */ int -ext2fs_buf_alloc(struct inode *ip, daddr_t bn, int size, struct ucred *cred, +ext2fs_buf_alloc(struct inode *ip, daddr_t bn, int size, struct ucred *cred, struct buf **bpp, int flags) { struct m_ext2fs *fs; @@ -259,8 +259,8 @@ fail: *allocib = 0; } else { int r; - - r = bread(vp, indirs[unwindidx].in_lbn, + + r = bread(vp, indirs[unwindidx].in_lbn, (int)fs->e2fs_bsize, &bp); if (r) { panic("Could not unwind indirect block, error %d", r); diff --git a/sys/ufs/ext2fs/ext2fs_bmap.c b/sys/ufs/ext2fs/ext2fs_bmap.c index 4a5c5b26b8b..adfc79effff 100644 --- a/sys/ufs/ext2fs/ext2fs_bmap.c +++ b/sys/ufs/ext2fs/ext2fs_bmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_bmap.c,v 1.21 2013/06/11 16:42:18 deraadt Exp $ */ +/* $OpenBSD: ext2fs_bmap.c,v 1.22 2014/05/27 14:31:24 krw Exp $ */ /* $NetBSD: ext2fs_bmap.c,v 1.5 2000/03/30 12:41:11 augustss Exp $ */ /* @@ -159,7 +159,7 @@ ext2fs_bmaparray(struct vnode *vp, int32_t bn, daddr_t *bnp, } #endif for (bp = NULL, ++xap; --num; ++xap) { - /* + /* * Exit the loop if there is no disk address assigned yet and * the indirect block isn't in the cache, or if we were * looking for an indirect block and we've found it. diff --git a/sys/ufs/ext2fs/ext2fs_dir.h b/sys/ufs/ext2fs/ext2fs_dir.h index df795fb906f..871adb51a8b 100644 --- a/sys/ufs/ext2fs/ext2fs_dir.h +++ b/sys/ufs/ext2fs/ext2fs_dir.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_dir.h,v 1.9 2013/06/02 06:41:12 guenther Exp $ */ +/* $OpenBSD: ext2fs_dir.h,v 1.10 2014/05/27 14:31:24 krw Exp $ */ /* $NetBSD: ext2fs_dir.h,v 1.4 2000/01/28 16:00:23 bouyer Exp $ */ /* @@ -89,7 +89,7 @@ struct ext2fs_direct { /* Ext2 directory file types (not the same as FFS. Sigh. */ #define EXT2_FT_UNKNOWN 0 -#define EXT2_FT_REG_FILE 1 +#define EXT2_FT_REG_FILE 1 #define EXT2_FT_DIR 2 #define EXT2_FT_CHRDEV 3 #define EXT2_FT_BLKDEV 4 diff --git a/sys/ufs/ext2fs/ext2fs_extern.h b/sys/ufs/ext2fs/ext2fs_extern.h index beac96e7fad..0b566e0071f 100644 --- a/sys/ufs/ext2fs/ext2fs_extern.h +++ b/sys/ufs/ext2fs/ext2fs_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_extern.h,v 1.33 2014/01/25 23:31:12 guenther Exp $ */ +/* $OpenBSD: ext2fs_extern.h,v 1.34 2014/05/27 14:31:24 krw Exp $ */ /* $NetBSD: ext2fs_extern.h,v 1.1 1997/06/11 09:33:55 bouyer Exp $ */ /*- @@ -62,7 +62,7 @@ int ext2fs_alloc(struct inode *, int32_t, int32_t , struct ucred *, int ext2fs_realloccg(struct inode *, int32_t, int32_t, int, int, struct ucred *, struct buf **); int ext2fs_reallocblks(void *); -int ext2fs_inode_alloc(struct inode *pip, mode_t mode, struct ucred *, +int ext2fs_inode_alloc(struct inode *pip, mode_t mode, struct ucred *, struct vnode **); daddr_t ext2fs_blkpref(struct inode *, int32_t, int, int32_t *); void ext2fs_blkfree(struct inode *, int32_t); diff --git a/sys/ufs/ext2fs/ext2fs_inode.c b/sys/ufs/ext2fs/ext2fs_inode.c index 4088587ee47..e49690beedc 100644 --- a/sys/ufs/ext2fs/ext2fs_inode.c +++ b/sys/ufs/ext2fs/ext2fs_inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_inode.c,v 1.47 2014/01/25 23:31:12 guenther Exp $ */ +/* $OpenBSD: ext2fs_inode.c,v 1.48 2014/05/27 14:31:24 krw Exp $ */ /* $NetBSD: ext2fs_inode.c,v 1.24 2001/06/19 12:59:18 wiz Exp $ */ /* @@ -106,7 +106,7 @@ ext2fs_setsize(struct inode *ip, u_int64_t size) */ int ext2fs_inactive(void *v) -{ +{ struct vop_inactive_args *ap = v; struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); @@ -146,7 +146,7 @@ out: if (ip->i_e2din == NULL || ip->i_e2fs_dtime != 0) vrecycle(vp, p); return (error); -} +} /* @@ -246,7 +246,7 @@ ext2fs_truncate(struct inode *oip, off_t length, int flags, struct ucred *cred) oip->i_flag |= IN_CHANGE | IN_UPDATE; return (ext2fs_update(oip, 1)); } - + if (ext2fs_size(oip) == length) { oip->i_flag |= IN_CHANGE | IN_UPDATE; return (ext2fs_update(oip, 0)); @@ -297,7 +297,7 @@ ext2fs_truncate(struct inode *oip, off_t length, int flags, struct ucred *cred) aflags = B_CLRBUF; if (flags & IO_SYNC) aflags |= B_SYNC; - error = ext2fs_buf_alloc(oip, lbn, offset, cred, &bp, + error = ext2fs_buf_alloc(oip, lbn, offset, cred, &bp, aflags); if (error) return (error); diff --git a/sys/ufs/ext2fs/ext2fs_lookup.c b/sys/ufs/ext2fs/ext2fs_lookup.c index 239efdd9c8d..a1be38f5b7c 100644 --- a/sys/ufs/ext2fs/ext2fs_lookup.c +++ b/sys/ufs/ext2fs/ext2fs_lookup.c @@ -1,7 +1,7 @@ -/* $OpenBSD: ext2fs_lookup.c,v 1.30 2013/12/12 19:00:09 tedu Exp $ */ +/* $OpenBSD: ext2fs_lookup.c,v 1.31 2014/05/27 14:31:24 krw Exp $ */ /* $NetBSD: ext2fs_lookup.c,v 1.16 2000/08/03 20:29:26 thorpej Exp $ */ -/* +/* * Modified for NetBSD 1.2E * May 1997, Manuel Bouyer * Laboratoire d'informatique de Paris VI @@ -79,8 +79,8 @@ static int ext2fs_dirbadentry(struct vnode *dp, * the problem that is tackled below is the fact that FFS * includes the terminating zero on disk while EXT2FS doesn't * this implies that we need to introduce some padding. - * For instance, a filename "sbin" has normally a reclen 12 - * in EXT2, but 16 in FFS. + * For instance, a filename "sbin" has normally a reclen 12 + * in EXT2, but 16 in FFS. * This reminds me of that Pepsi commercial: 'Kid saved a lousy nine cents...' * If it wasn't for that, the complete ufs code for directories would * have worked w/o changes (except for the difference in DIRBLKSIZ) @@ -105,7 +105,7 @@ ext2fs_dirconv2ffs(struct ext2fs_direct *e2dir, struct dirent *ffsdir) #endif strncpy(ffsdir->d_name, e2dir->e2d_name, ffsdir->d_namlen); - /* Godmar thinks: since e2dir->e2d_reclen can be big and means + /* Godmar thinks: since e2dir->e2d_reclen can be big and means nothing anyway, we compute our own reclen according to what we think is right */ @@ -118,7 +118,7 @@ ext2fs_dirconv2ffs(struct ext2fs_direct *e2dir, struct dirent *ffsdir) * Convert the on-disk entries to <sys/dirent.h> entries. * the problem is that the conversion will blow up some entries by four bytes, * so it can't be done in place. This is too bad. Right now the conversion is - * done entry by entry, the converted entry is sent via uiomove. + * done entry by entry, the converted entry is sent via uiomove. * * XXX allocate a buffer, convert as many entries as possible, then send * the whole buffer to uiomove @@ -164,7 +164,7 @@ ext2fs_readdir(void *v) error = VOP_READ(ap->a_vp, &auio, 0, ap->a_cred); if (error == 0) { readcnt = e2fs_count - auio.uio_resid; - for (dp = (struct ext2fs_direct *)dirbuf; + for (dp = (struct ext2fs_direct *)dirbuf; (char *)dp < (char *)dirbuf + readcnt; ) { e2d_reclen = fs2h16(dp->e2d_reclen); if (e2d_reclen == 0) { @@ -317,7 +317,7 @@ ext2fs_lookup(void *v) } else { dp->i_offset = dp->i_diroff; if ((entryoffsetinblock = dp->i_offset & bmask) && - (error = ext2fs_bufatoff(dp, (off_t)dp->i_offset, + (error = ext2fs_bufatoff(dp, (off_t)dp->i_offset, NULL, &bp))) return (error); numdirpasses = 2; @@ -334,7 +334,7 @@ searchloop: if ((dp->i_offset & bmask) == 0) { if (bp != NULL) brelse(bp); - error = ext2fs_bufatoff(dp, (off_t)dp->i_offset, + error = ext2fs_bufatoff(dp, (off_t)dp->i_offset, NULL, &bp); if (error != 0) return (error); @@ -793,7 +793,7 @@ ext2fs_direnter(struct inode *ip, struct vnode *dvp, /* * Get the block containing the space for the new directory entry. */ - if ((error = ext2fs_bufatoff(dp, (off_t)dp->i_offset, &dirbuf, &bp)) + if ((error = ext2fs_bufatoff(dp, (off_t)dp->i_offset, &dirbuf, &bp)) != 0) return (error); /* @@ -871,13 +871,13 @@ ext2fs_dirremove(struct vnode *dvp, struct componentname *cnp) struct ext2fs_direct *ep; struct buf *bp; int error; - + dp = VTOI(dvp); if (dp->i_count == 0) { /* * First entry in block: set d_ino to zero. */ - error = ext2fs_bufatoff(dp, (off_t)dp->i_offset, (char **)&ep, + error = ext2fs_bufatoff(dp, (off_t)dp->i_offset, (char **)&ep, &bp); if (error != 0) return (error); @@ -944,7 +944,7 @@ ext2fs_dirempty(struct inode *ip, ufsino_t parentino, struct ucred *cred) struct ext2fs_direct *dp = (struct ext2fs_direct *)&dbuf; int error, namlen; size_t count; - + #define MINDIRSIZ (sizeof (struct ext2fs_dirtemplate) / 2) for (off = 0; off < ext2fs_size(ip); off += fs2h16(dp->e2d_reclen)) { diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c index 74d3b2b85e9..94cd9448d1d 100644 --- a/sys/ufs/ext2fs/ext2fs_vfsops.c +++ b/sys/ufs/ext2fs/ext2fs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_vfsops.c,v 1.70 2013/12/12 19:00:09 tedu Exp $ */ +/* $OpenBSD: ext2fs_vfsops.c,v 1.71 2014/05/27 14:31:24 krw Exp $ */ /* $NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $ */ /* @@ -227,7 +227,7 @@ ext2fs_mount(struct mount *mp, const char *path, void *data, /* * Process export requests. */ - return (vfs_export(mp, &ump->um_export, + return (vfs_export(mp, &ump->um_export, &args.export_info)); } } @@ -349,14 +349,14 @@ ext2fs_reload_vnode(struct vnode *vp, void *args) */ if (vget(vp, LK_EXCLUSIVE, era->p)) return (0); - + if (vinvalbuf(vp, 0, era->cred, era->p, 0, 0)) panic("ext2fs_reload: dirty2"); /* * Step 6: re-read inode data for all active vnodes. */ ip = VTOI(vp); - error = bread(era->devvp, + error = bread(era->devvp, fsbtodb(era->fs, ino_to_fsba(era->fs, ip->i_number)), (int)era->fs->e2fs_bsize, &bp); if (error) { @@ -419,7 +419,7 @@ ext2fs_reload(struct mount *mountp, struct ucred *cred, struct proc *p) } fs = VFSTOUFS(mountp)->um_e2fs; - /* + /* * copy in new superblock, and compute in-memory values */ e2fs_sbload(newfs, &fs->e2fs); @@ -521,7 +521,7 @@ ext2fs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p) m_fs = ump->um_e2fs; m_fs->e2fs_ronly = ronly; ump->um_fstype = UM_EXT2FS; - + #ifdef DEBUG_EXT2 printf("ext2 ino size %d\n", EXT2_DINODE_SIZE(m_fs)); #endif @@ -715,14 +715,14 @@ struct ext2fs_sync_args { }; int -ext2fs_sync_vnode(struct vnode *vp, void *args) +ext2fs_sync_vnode(struct vnode *vp, void *args) { struct ext2fs_sync_args *esa = args; struct inode *ip; int error; ip = VTOI(vp); - if (vp->v_type == VNON || + if (vp->v_type == VNON || ((ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0 && LIST_EMPTY(&vp->v_dirtyblkhd)) || esa->waitfor == MNT_LAZY) { @@ -872,7 +872,7 @@ ext2fs_vget(struct mount *mp, ino_t ino, struct vnode **vpp) dp = (struct ext2fs_dinode *) ((char *)bp->b_data + EXT2_DINODE_SIZE(fs) * ino_to_fsbo(fs, ino)); - + ip->i_e2din = pool_get(&ext2fs_dinode_pool, PR_WAITOK); e2fs_iload(dp, ip->i_e2din); brelse(bp); @@ -957,7 +957,7 @@ ext2fs_fhtovp(struct mount *mp, struct fid *fhp, struct vnode **vpp) return (error); } ip = VTOI(nvp); - if (ip->i_e2fs_mode == 0 || ip->i_e2fs_dtime != 0 || + if (ip->i_e2fs_mode == 0 || ip->i_e2fs_dtime != 0 || ip->i_e2fs_gen != ufhp->ufid_gen) { vput(nvp); *vpp = NULLVP; @@ -1032,7 +1032,7 @@ ext2fs_cgupdate(struct ufsmount *mp, int waitfor) else bawrite(bp); } - + if (!allerror && error) allerror = error; return (allerror); diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c index 0acdfdaa6d9..7ded537a6cc 100644 --- a/sys/ufs/ext2fs/ext2fs_vnops.c +++ b/sys/ufs/ext2fs/ext2fs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_vnops.c,v 1.64 2014/01/25 23:31:12 guenther Exp $ */ +/* $OpenBSD: ext2fs_vnops.c,v 1.65 2014/05/27 14:31:24 krw Exp $ */ /* $NetBSD: ext2fs_vnops.c,v 1.1 1997/06/11 09:34:09 bouyer Exp $ */ /* @@ -80,7 +80,7 @@ int ext2fs_create(void *v) { struct vop_create_args *ap = v; - return ext2fs_makeinode(MAKEIMODE(ap->a_vap->va_type, + return ext2fs_makeinode(MAKEIMODE(ap->a_vap->va_type, ap->a_vap->va_mode), ap->a_dvp, ap->a_vpp, ap->a_cnp); } @@ -238,11 +238,11 @@ ext2fs_setattr(void *v) return (error); #ifdef EXT2FS_SYSTEM_FLAGS if (cred->cr_uid == 0) { - if ((ip->i_e2fs_flags & + if ((ip->i_e2fs_flags & (EXT2_APPEND | EXT2_IMMUTABLE)) && securelevel > 0) return (EPERM); ip->i_e2fs_flags &= ~(EXT2_APPEND | EXT2_IMMUTABLE); - ip->i_e2fs_flags |= + ip->i_e2fs_flags |= (vap->va_flags & SF_APPEND) ? EXT2_APPEND : 0 | (vap->va_flags & SF_IMMUTABLE) ? EXT2_IMMUTABLE: 0; } else { @@ -250,7 +250,7 @@ ext2fs_setattr(void *v) } #else ip->i_e2fs_flags &= ~(EXT2_APPEND | EXT2_IMMUTABLE); - ip->i_e2fs_flags |= + ip->i_e2fs_flags |= (vap->va_flags & UF_APPEND) ? EXT2_APPEND : 0 | (vap->va_flags & UF_IMMUTABLE) ? EXT2_IMMUTABLE: 0; #endif @@ -295,7 +295,7 @@ ext2fs_setattr(void *v) return (EROFS); if (cred->cr_uid != ip->i_e2fs_uid && (error = suser_ucred(cred)) && - ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || + ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || (error = VOP_ACCESS(vp, VWRITE, cred, p)))) return (error); if (vap->va_mtime.tv_sec != VNOVAL) @@ -594,7 +594,7 @@ abortit: if ((ip->i_e2fs_mode & IFMT) == IFDIR) { error = VOP_ACCESS(fvp, VWRITE, tcnp->cn_cred, tcnp->cn_proc); if (!error && tvp) - error = VOP_ACCESS(tvp, VWRITE, tcnp->cn_cred, + error = VOP_ACCESS(tvp, VWRITE, tcnp->cn_cred, tcnp->cn_proc); if (error) { VOP_UNLOCK(fvp, 0, p); @@ -647,7 +647,7 @@ abortit: * directory hierarchy above the target, as this would * orphan everything below the source directory. Also * the user must have write permission in the source so - * as to be able to change "..". We must repeat the call + * as to be able to change "..". We must repeat the call * to namei, as the parent directory is unlocked by the * call to checkpath(). */ @@ -674,7 +674,7 @@ abortit: } /* * 2) If target doesn't exist, link the target - * to the source and unlink the source. + * to the source and unlink the source. * Otherwise, rewrite the target directory * entry to reference the source inode and * expunge the original entry's existence. @@ -828,7 +828,7 @@ abortit: dp->i_flag |= IN_CHANGE; error = vn_rdwr(UIO_READ, fvp, (caddr_t)&dirbuf, sizeof (struct ext2fs_dirtemplate), (off_t)0, - UIO_SYSSPACE, IO_NODELOCKED, + UIO_SYSSPACE, IO_NODELOCKED, tcnp->cn_cred, NULL, curproc); if (error == 0) { namlen = dirbuf.dotdot_namlen; @@ -1098,7 +1098,7 @@ ext2fs_symlink(void *v) error = vn_rdwr(UIO_WRITE, vp, ap->a_target, len, (off_t)0, UIO_SYSSPACE, IO_NODELOCKED, ap->a_cnp->cn_cred, NULL, curproc); -bad: +bad: vput(vp); return (error); } @@ -1176,7 +1176,7 @@ ext2fs_makeinode(int mode, struct vnode *dvp, struct vnode **vpp, if ((mode & IFMT) == 0) mode |= IFREG; - if ((error = ext2fs_inode_alloc(pdir, mode, cnp->cn_cred, &tvp)) + if ((error = ext2fs_inode_alloc(pdir, mode, cnp->cn_cred, &tvp)) != 0) { pool_put(&namei_pool, cnp->cn_pnbuf); vput(dvp); @@ -1248,7 +1248,7 @@ ext2fs_reclaim(void *v) #ifdef DIAGNOSTIC extern int prtactive; - if (prtactive && vp->v_usecount != 0) + if (prtactive && vp->v_usecount != 0) vprint("ext2fs_reclaim: pushing active", vp); #endif |