From owner-svn-src-all@freebsd.org  Wed Jul 13 10:49:34 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3EDA3B976B9;
 Wed, 13 Jul 2016 10:49:34 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F22561EEA;
 Wed, 13 Jul 2016 10:49:33 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6DAnXZf019519;
 Wed, 13 Jul 2016 10:49:33 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6DAnXxj019518;
 Wed, 13 Jul 2016 10:49:33 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201607131049.u6DAnXxj019518@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 13 Jul 2016 10:49:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r302757 -
 stable/9/sys/cddl/contrib/opensolaris/uts/common/fs
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jul 2016 10:49:34 -0000

Author: avg
Date: Wed Jul 13 10:49:32 2016
New Revision: 302757
URL: https://svnweb.freebsd.org/changeset/base/302757

Log:
  fix a mismerge in r302751
  
  This is a direct commit.

Modified:
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c	Wed Jul 13 10:32:24 2016	(r302756)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c	Wed Jul 13 10:49:32 2016	(r302757)
@@ -443,7 +443,6 @@ gfs_lookup_dot(vnode_t **vpp, vnode_t *d
 		ASSERT(pvp != NULL);
 		VN_HOLD(pvp);
 		*vpp = pvp;
-		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
 		return (0);
 	}