svn commit: r189791 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb ufs/ffs

[Konstantin Belousov]

Author: kib
Date: Sat Mar 14 14:02:53 2009
New Revision: 189791
URL: http://svn.freebsd.org/changeset/base/189791

Log:
  MFC r189706:
  Do not double-free the struct inode when insmntque failed. Default
  insmntque destructor reclaims the vnode, and ufs_reclaim frees the memory.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/ufs/ffs/ffs_vfsops.c

Modified: stable/7/sys/ufs/ffs/ffs_vfsops.c
==============================================================================
--- stable/7/sys/ufs/ffs/ffs_vfsops.c	Sat Mar 14 13:42:13 2009	(r189790)
+++ stable/7/sys/ufs/ffs/ffs_vfsops.c	Sat Mar 14 14:02:53 2009	(r189791)
@@ -1465,7 +1465,6 @@ 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);
 	}