svn commit: r185868 - in releng/7.1/sys: . contrib/pf dev/cxgb fs/nullfs

[Konstantin Belousov]

Author: kib
Date: Wed Dec 10 17:16:11 2008
New Revision: 185868
URL: http://svn.freebsd.org/changeset/base/185868

Log:
  MFC r185335:
  In null_lookup(), do the needed cleanup instead of panicing saying
  the cleanup is needed.
  
  Approved by:	re (kensmith)

Modified:
  releng/7.1/sys/   (props changed)
  releng/7.1/sys/contrib/pf/   (props changed)
  releng/7.1/sys/dev/cxgb/   (props changed)
  releng/7.1/sys/fs/nullfs/null_vnops.c

Modified: releng/7.1/sys/fs/nullfs/null_vnops.c
==============================================================================
--- releng/7.1/sys/fs/nullfs/null_vnops.c	Wed Dec 10 17:07:13 2008	(r185867)
+++ releng/7.1/sys/fs/nullfs/null_vnops.c	Wed Dec 10 17:16:11 2008	(r185868)
@@ -365,11 +365,10 @@ null_lookup(struct vop_lookup_args *ap)
 			vrele(lvp);
 		} else {
 			error = null_nodeget(dvp->v_mount, lvp, &vp);
-			if (error) {
-				/* XXX Cleanup needed... */
-				panic("null_nodeget failed");
-			}
-			*ap->a_vpp = vp;
+			if (error)
+				vput(lvp);
+			else
+				*ap->a_vpp = vp;
 		}
 	}
 	return (error);