svn commit: r187552 - in stable/7/sys: . compat/linprocfs contrib/pf dev/ath/ath_hal dev/cxgb

[John Baldwin]

Author: jhb
Date: Wed Jan 21 18:26:10 2009
New Revision: 187552
URL: http://svn.freebsd.org/changeset/base/187552

Log:
  MFC: Don't leak a reference on the /compat/linux vnode everytime
  the linprocfs 'mtab' file is read.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/compat/linprocfs/linprocfs.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- stable/7/sys/compat/linprocfs/linprocfs.c	Wed Jan 21 17:49:23 2009	(r187551)
+++ stable/7/sys/compat/linprocfs/linprocfs.c	Wed Jan 21 18:26:10 2009	(r187552)
@@ -315,11 +315,13 @@ linprocfs_domtab(PFS_FILL_ARGS)
 	NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_SYSSPACE, linux_emul_path, td);
 	flep = NULL;
 	error = namei(&nd);
-	VFS_UNLOCK_GIANT(NDHASGIANT(&nd));
-	if (error != 0 || vn_fullpath(td, nd.ni_vp, &dlep, &flep) != 0)
-		lep = linux_emul_path;
-	else
-		lep = dlep;
+	lep = linux_emul_path;
+	if (error == 0) {
+		if (vn_fullpath(td, nd.ni_vp, &dlep, &flep) != 0)
+			lep = dlep;
+		vrele(nd.ni_vp);
+		VFS_UNLOCK_GIANT(NDHASGIANT(&nd));
+	}
 	lep_len = strlen(lep);
 
 	mtx_lock(&mountlist_mtx);