From owner-svn-src-head@freebsd.org  Sat Jan 21 20:34:21 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 583D3CBBA52;
 Sat, 21 Jan 2017 20:34:21 +0000 (UTC) (envelope-from mjg@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 2222B10F8;
 Sat, 21 Jan 2017 20:34:21 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0LKYKJa021808;
 Sat, 21 Jan 2017 20:34:20 GMT (envelope-from mjg@FreeBSD.org)
Received: (from mjg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0LKYKA9021807;
 Sat, 21 Jan 2017 20:34:20 GMT (envelope-from mjg@FreeBSD.org)
Message-Id: <201701212034.v0LKYKA9021807@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org
 using -f
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Sat, 21 Jan 2017 20:34:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r312606 - head/sys/kern
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Jan 2017 20:34:21 -0000

Author: mjg
Date: Sat Jan 21 20:34:20 2017
New Revision: 312606
URL: https://svnweb.freebsd.org/changeset/base/312606

Log:
  vfs: fix LK_RETRY logic braino in r312600

Modified:
  head/sys/kern/vfs_vnops.c

Modified: head/sys/kern/vfs_vnops.c
==============================================================================
--- head/sys/kern/vfs_vnops.c	Sat Jan 21 19:56:28 2017	(r312605)
+++ head/sys/kern/vfs_vnops.c	Sat Jan 21 20:34:20 2017	(r312606)
@@ -1549,13 +1549,15 @@ retry:
 	KASSERT((flags & LK_RETRY) == 0 || error == 0,
 	    ("LK_RETRY set with incompatible flags (0x%x) or "
 	    " an error occurred (%d)", flags, error));
-	if (flags & LK_RETRY) {
-		if ((error != 0))
-			goto retry;
-		if ((vp->v_iflag & VI_DOOMED)) {
+
+	if ((flags & LK_RETRY) == 0) {
+		if (error == 0 && vp->v_iflag & VI_DOOMED) {
 			VOP_UNLOCK(vp, 0);
 			error = ENOENT;
 		}
+	} else {
+		if (error != 0)
+			goto retry;
 	}
 	return (error);
 }