From owner-svn-src-head@FreeBSD.ORG  Sun May 31 20:16:07 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A1BF21065677;
	Sun, 31 May 2009 20:16:07 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 75A7D8FC23;
	Sun, 31 May 2009 20:16:07 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VKG7HV053831;
	Sun, 31 May 2009 20:16:07 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4VKG7E2053830;
	Sun, 31 May 2009 20:16:07 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200905312016.n4VKG7E2053830@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 31 May 2009 20:16:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193186 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 May 2009 20:16:10 -0000

Author: kib
Date: Sun May 31 20:16:06 2009
New Revision: 193186
URL: http://svn.freebsd.org/changeset/base/193186

Log:
  Unbreak the build. Add missed probes.
  
  Reviewed by:	rwatson
  Pointy hat to:	me

Modified:
  head/sys/kern/vfs_cache.c

Modified: head/sys/kern/vfs_cache.c
==============================================================================
--- head/sys/kern/vfs_cache.c	Sun May 31 19:37:06 2009	(r193185)
+++ head/sys/kern/vfs_cache.c	Sun May 31 20:16:06 2009	(r193186)
@@ -1073,7 +1073,7 @@ vn_vptocnp_locked(struct vnode **vp, cha
 			numfullpathfail4++;
 			error = ENOMEM;
 			SDT_PROBE(vfs, namecache, fullpath, return, error,
-			    startvp, NULL, 0, 0);
+			    vp, NULL, 0, 0);
 			return (error);
 		}
 		*buflen -= ncp->nc_nlen;
@@ -1095,7 +1095,7 @@ vn_vptocnp_locked(struct vnode **vp, cha
 	VFS_UNLOCK_GIANT(vfslocked);
 	if (error) {
 		numfullpathfail2++;
-		SDT_PROBE(vfs, namecache, fullpath, return,  error, startvp,
+		SDT_PROBE(vfs, namecache, fullpath, return,  error, vp,
 		    NULL, 0, 0);
 		return (error);
 	}
@@ -1107,7 +1107,7 @@ vn_vptocnp_locked(struct vnode **vp, cha
 		CACHE_RUNLOCK();
 		vdrop(*vp);
 		error = ENOENT;
-		SDT_PROBE(vfs, namecache, fullpath, return, error, startvp,
+		SDT_PROBE(vfs, namecache, fullpath, return, error, vp,
 		    NULL, 0, 0);
 		return (error);
 	}
@@ -1150,6 +1150,8 @@ vn_fullpath1(struct thread *td, struct v
 			if (vp->v_iflag & VI_DOOMED) {	/* forced unmount */
 				CACHE_RUNLOCK();
 				error = ENOENT;
+				SDT_PROBE(vfs, namecache, fullpath, return,
+				    error, vp, NULL, 0, 0);
 				break;
 			}
 			vp = vp->v_mount->mnt_vnodecovered;
@@ -1159,6 +1161,8 @@ vn_fullpath1(struct thread *td, struct v
 			CACHE_RUNLOCK();
 			numfullpathfail1++;
 			error = ENOTDIR;
+			SDT_PROBE(vfs, namecache, fullpath, return,
+			    error, vp, NULL, 0, 0);
 			break;
 		}
 		error = vn_vptocnp_locked(&vp, buf, &buflen);
@@ -1166,6 +1170,8 @@ vn_fullpath1(struct thread *td, struct v
 			break;
 		if (buflen == 0) {
 			error = ENOMEM;
+			SDT_PROBE(vfs, namecache, fullpath, return, error,
+			    startvp, NULL, 0, 0);
 			break;
 		}
 		buf[--buflen] = '/';
@@ -1177,8 +1183,8 @@ vn_fullpath1(struct thread *td, struct v
 		if (buflen == 0) {
 			CACHE_RUNLOCK();
 			numfullpathfail4++;
-			SDT_PROBE(vfs, namecache, fullpath, return, 0,
-			    startvp, fullpath, 0, 0);
+			SDT_PROBE(vfs, namecache, fullpath, return, ENOMEM,
+			    startvp, NULL, 0, 0);
 			return (ENOMEM);
 		}
 		buf[--buflen] = '/';
@@ -1186,7 +1192,7 @@ vn_fullpath1(struct thread *td, struct v
 	numfullpathfound++;
 	CACHE_RUNLOCK();
 
-	SDT_PROBE(vfs, namecache, fullpath, return, 0, startvp, buf + *buflen,
+	SDT_PROBE(vfs, namecache, fullpath, return, 0, startvp, buf + buflen,
 	    0, 0);
 	*retbuf = buf + buflen;
 	return (0);