Date: Thu, 10 Sep 2009 13:01:23 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r197063 - in stable/7/sys: . contrib/pf fs/pseudofs net ufs/ffs Message-ID: <200909101301.n8AD1NDW020218@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909101301.n8AD1NDW020218>