Author: kib
Date: Thu Sep 10 13:01:23 2009
New Revision: 197063
URL: http://svn.freebsd.org/changeset/base/197063
Log:
MFC r196920:
insmntque_stddtr() clears vp->v_data and resets vp->v_op to
dead_vnodeops before calling vgone(). Revert r189706 and corresponding
part of the r186560.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/fs/pseudofs/pseudofs_vncache.c
stable/7/sys/net/ (props changed)
stable/7/sys/ufs/ffs/ffs_vfsops.c
Modified: stable/7/sys/fs/pseudofs/pseudofs_vncache.c
==============================================================================
--- stable/7/sys/fs/pseudofs/pseudofs_vncache.c Thu Sep 10 12:58:37 2009
(r197062)
+++ stable/7/sys/fs/pseudofs/pseudofs_vncache.c Thu Sep 10 13:01:23 2009
(r197063)
@@ -193,6 +193,7 @@ retry:
vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, curthread);
error = insmntque(*vpp, mp);
if (error != 0) {
+ free(pvd, M_PFSVNCACHE);
*vpp = NULLVP;
return (error);
}
Modified: stable/7/sys/ufs/ffs/ffs_vfsops.c
==============================================================================
--- stable/7/sys/ufs/ffs/ffs_vfsops.c Thu Sep 10 12:58:37 2009
(r197062)
+++ stable/7/sys/ufs/ffs/ffs_vfsops.c Thu Sep 10 13:01:23 2009
(r197063)
@@ -1466,6 +1466,7 @@ ffs_vgetf(mp, ino, flags, vpp, ffs_flags
vp->v_vflag |= VV_FORCEINSMQ;
error = insmntque(vp, mp);
if (error != 0) {
+ uma_zfree(uma_inode, ip);
*vpp = NULL;
return (error);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
