Page MenuHomeFreeBSD

D23215.id67301.diff
No OneTemporary

D23215.id67301.diff

Index: head/sys/ufs/ffs/ffs_vfsops.c
===================================================================
--- head/sys/ufs/ffs/ffs_vfsops.c
+++ head/sys/ufs/ffs/ffs_vfsops.c
@@ -1787,6 +1787,7 @@
* still zero, it will be unlinked and returned to the free
* list by vput().
*/
+ vgone(vp);
vput(vp);
*vpp = NULL;
return (error);
@@ -1797,6 +1798,7 @@
ip->i_din2 = uma_zalloc(uma_ufs2, M_WAITOK);
if ((error = ffs_load_inode(bp, ip, fs, ino)) != 0) {
bqrelse(bp);
+ vgone(vp);
vput(vp);
*vpp = NULL;
return (error);
@@ -1814,6 +1816,7 @@
error = ufs_vinit(mp, I_IS_UFS1(ip) ? &ffs_fifoops1 : &ffs_fifoops2,
&vp);
if (error) {
+ vgone(vp);
vput(vp);
*vpp = NULL;
return (error);
@@ -1849,6 +1852,7 @@
error = mac_vnode_associate_extattr(mp, vp);
if (error) {
/* ufs_inactive will release ip->i_devvp ref. */
+ vgone(vp);
vput(vp);
*vpp = NULL;
return (error);
Index: head/sys/ufs/ufs/ufs_vnops.c
===================================================================
--- head/sys/ufs/ufs/ufs_vnops.c
+++ head/sys/ufs/ufs/ufs_vnops.c
@@ -1839,6 +1839,7 @@
if (DOINGSOFTDEP(tvp))
softdep_revert_link(dp, ip);
UFS_VFREE(tvp, ip->i_number, dmode);
+ vgone(tvp);
vput(tvp);
return (error);
}
@@ -1853,6 +1854,7 @@
if (DOINGSOFTDEP(tvp))
softdep_revert_link(dp, ip);
UFS_VFREE(tvp, ip->i_number, dmode);
+ vgone(tvp);
vput(tvp);
return (error);
}
@@ -1980,7 +1982,7 @@
UFS_INODE_SET_FLAG(ip, IN_CHANGE);
if (DOINGSOFTDEP(tvp))
softdep_revert_mkdir(dp, ip);
-
+ vgone(tvp);
vput(tvp);
}
out:
@@ -2607,6 +2609,7 @@
if (DOINGSOFTDEP(tvp))
softdep_revert_link(pdir, ip);
UFS_VFREE(tvp, ip->i_number, mode);
+ vgone(tvp);
vput(tvp);
return (error);
}
@@ -2621,6 +2624,7 @@
if (DOINGSOFTDEP(tvp))
softdep_revert_link(pdir, ip);
UFS_VFREE(tvp, ip->i_number, mode);
+ vgone(tvp);
vput(tvp);
return (error);
}
@@ -2691,6 +2695,7 @@
UFS_INODE_SET_FLAG(ip, IN_CHANGE);
if (DOINGSOFTDEP(tvp))
softdep_revert_create(VTOI(dvp), ip);
+ vgone(tvp);
vput(tvp);
return (error);
}

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 14, 5:09 AM (13 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31427148
Default Alt Text
D23215.id67301.diff (2 KB)

Event Timeline