From owner-svn-src-projects@FreeBSD.ORG  Sun Jul 22 14:33:15 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3ABD710657E3;
	Sun, 22 Jul 2012 14:33:15 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 25A178FC18;
	Sun, 22 Jul 2012 14:33:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MEXEph094501;
	Sun, 22 Jul 2012 14:33:14 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MEXEFg094499;
	Sun, 22 Jul 2012 14:33:14 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201207221433.q6MEXEFg094499@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sun, 22 Jul 2012 14:33:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238691 - projects/fuse/sys/fs/fuse
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2012 14:33:15 -0000

Author: attilio
Date: Sun Jul 22 14:33:14 2012
New Revision: 238691
URL: http://svn.freebsd.org/changeset/base/238691

Log:
  Fix ISDOTDOT lookup that is completely broken by inlining vn_vget_ino()
  (for using internal nodes handover function).
  
  Reported by:	pho
  Tested by:	pho

Modified:
  projects/fuse/sys/fs/fuse/fuse_vnops.c

Modified: projects/fuse/sys/fs/fuse/fuse_vnops.c
==============================================================================
--- projects/fuse/sys/fs/fuse/fuse_vnops.c	Sun Jul 22 14:33:04 2012	(r238690)
+++ projects/fuse/sys/fs/fuse/fuse_vnops.c	Sun Jul 22 14:33:14 2012	(r238691)
@@ -933,9 +933,30 @@ calldaemon:
 			goto out;
 		}
 		if (flags & ISDOTDOT) {
+			struct mount *mp;
 			int ltype;
 
+			/*
+			 * Expanded copy of vn_vget_ino() so that
+			 * fuse_vnode_get() can be used.
+			 */
+			mp = dvp->v_mount;
 			ltype = VOP_ISLOCKED(dvp);
+			err = vfs_busy(mp, MBF_NOWAIT);
+			if (err != 0) {
+				vfs_ref(mp);
+				VOP_UNLOCK(dvp, 0);
+				err = vfs_busy(mp, 0);
+				vn_lock(dvp, ltype | LK_RETRY);
+				vfs_rel(mp);
+				if (err)
+					goto out;
+				if ((dvp->v_iflag & VI_DOOMED) != 0) {
+					err = ENOENT;
+					vfs_unbusy(mp);
+					goto out;
+				}
+			}
 			VOP_UNLOCK(dvp, 0);
 			err = fuse_vnode_get(vnode_mount(dvp),
 			    nid,
@@ -943,8 +964,15 @@ calldaemon:
 			    &vp,
 			    cnp,
 			    IFTOVT(fattr->mode));
+			vfs_unbusy(mp);
 			vn_lock(dvp, ltype | LK_RETRY);
-			vref(vp);
+			if ((dvp->v_iflag & VI_DOOMED) != 0) {
+				if (err == 0)
+					vput(vp);
+				err = ENOENT;
+			}
+			if (err)
+				goto out;
 			*vpp = vp;
 		} else if (nid == VTOI(dvp)) {
 			vref(dvp);