From owner-svn-src-head@FreeBSD.ORG  Wed Nov 14 18:43:59 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 38F4029B;
 Wed, 14 Nov 2012 18:43:59 +0000 (UTC)
 (envelope-from davide@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1F4F38FC18;
 Wed, 14 Nov 2012 18:43:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAEIhw22028379;
 Wed, 14 Nov 2012 18:43:58 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAEIhwI9028378;
 Wed, 14 Nov 2012 18:43:58 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201211141843.qAEIhwI9028378@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Wed, 14 Nov 2012 18:43:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243033 - head/sys/fs/smbfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Wed, 14 Nov 2012 18:43:59 -0000

Author: davide
Date: Wed Nov 14 18:43:58 2012
New Revision: 243033
URL: http://svnweb.freebsd.org/changeset/base/243033

Log:
  Fix the lookup in the DOTDOT case in the same way as other filesystems do,
  i.e. inlining the vn_vget_ino() algorithm.
  
  Sponsored by:	iXsystems inc.

Modified:
  head/sys/fs/smbfs/smbfs_vnops.c

Modified: head/sys/fs/smbfs/smbfs_vnops.c
==============================================================================
--- head/sys/fs/smbfs/smbfs_vnops.c	Wed Nov 14 17:44:37 2012	(r243032)
+++ head/sys/fs/smbfs/smbfs_vnops.c	Wed Nov 14 18:43:58 2012	(r243033)
@@ -1278,9 +1278,30 @@ smbfs_lookup(ap)
 		goto out;
 	}
 	if (flags & ISDOTDOT) {
+		mp = dvp->v_mount;
+		error = vfs_busy(mp, MBF_NOWAIT);
+		if (error != 0) {
+			vfs_ref(mp);
+			VOP_UNLOCK(dvp, 0);
+			error = vfs_busy(mp, 0);
+			vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
+			vfs_rel(mp);
+			if (error)
+				return (ENOENT);
+			if ((dvp->v_iflag & VI_DOOMED) != 0) {
+				vfs_unbusy(mp);
+				return (ENOENT);	
+			}
+		}	
 		VOP_UNLOCK(dvp, 0);
 		error = smbfs_nget(mp, dvp, name, nmlen, NULL, &vp);
+		vfs_unbusy(mp);
 		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
+		if ((dvp->v_iflag & VI_DOOMED) != 0) {
+			if (error == 0)
+				vput(vp);
+			error = ENOENT;
+		}
 		if (error)
 			goto out;
 		*vpp = vp;