diff options
| author | Eivind Eklund <eivind@FreeBSD.org> | 1999-11-12 03:34:28 +0000 |
|---|---|---|
| committer | Eivind Eklund <eivind@FreeBSD.org> | 1999-11-12 03:34:28 +0000 |
| commit | edfe736df916f9ca24d812ba13c52aed1fe8b4da (patch) | |
| tree | bbd7a274a33855ba0b75b1c22be91fb6dfc52472 /sys/gnu | |
| parent | 0e46cd3e223d4f2357b1d02a727e273068e61e03 (diff) | |
| download | src-edfe736df916f9ca24d812ba13c52aed1fe8b4da.tar.gz src-edfe736df916f9ca24d812ba13c52aed1fe8b4da.zip | |
Remove WILLRELE from VOP_RENAME
Notes
Notes:
svn path=/head/; revision=53101
Diffstat (limited to 'sys/gnu')
| -rw-r--r-- | sys/gnu/ext2fs/ext2_vnops.c | 9 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_vnops.c | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c index 82eedd8996cf..ee64c44eb048 100644 --- a/sys/gnu/ext2fs/ext2_vnops.c +++ b/sys/gnu/ext2fs/ext2_vnops.c @@ -43,6 +43,7 @@ * * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95 * @(#)ext2_vnops.c 8.7 (Berkeley) 2/3/94 + * $FreeBSD$ */ #include "opt_quota.h" @@ -262,14 +263,18 @@ ext2_mknod(ap) ip->i_rdev = vap->va_rdev; } /* - * Remove inode so that it will be reloaded by VFS_VGET and + * Remove inode, then reload it through VFS_VGET so it is * checked to see if it is an alias of an existing entry in * the inode cache. */ vput(*vpp); (*vpp)->v_type = VNON; vgone(*vpp); - *vpp = 0; + error = VFS_VGET(ap->a_dvp->v_mount, ip->i_ino, vpp); + if (error) { + *vpp = NULL; + return (error); + } return (0); } diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c index 82eedd8996cf..ee64c44eb048 100644 --- a/sys/gnu/fs/ext2fs/ext2_vnops.c +++ b/sys/gnu/fs/ext2fs/ext2_vnops.c @@ -43,6 +43,7 @@ * * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95 * @(#)ext2_vnops.c 8.7 (Berkeley) 2/3/94 + * $FreeBSD$ */ #include "opt_quota.h" @@ -262,14 +263,18 @@ ext2_mknod(ap) ip->i_rdev = vap->va_rdev; } /* - * Remove inode so that it will be reloaded by VFS_VGET and + * Remove inode, then reload it through VFS_VGET so it is * checked to see if it is an alias of an existing entry in * the inode cache. */ vput(*vpp); (*vpp)->v_type = VNON; vgone(*vpp); - *vpp = 0; + error = VFS_VGET(ap->a_dvp->v_mount, ip->i_ino, vpp); + if (error) { + *vpp = NULL; + return (error); + } return (0); } |