From owner-svn-src-all@FreeBSD.ORG  Sun Jun 17 21:04:23 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F0CD106566C;
	Sun, 17 Jun 2012 21:04:23 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1A6AB8FC08;
	Sun, 17 Jun 2012 21:04:23 +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 q5HL4MuD032501;
	Sun, 17 Jun 2012 21:04:22 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5HL4M0t032499;
	Sun, 17 Jun 2012 21:04:22 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201206172104.q5HL4M0t032499@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 17 Jun 2012 21:04:22 +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: r237204 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jun 2012 21:04:23 -0000

Author: pjd
Date: Sun Jun 17 21:04:22 2012
New Revision: 237204
URL: http://svn.freebsd.org/changeset/base/237204

Log:
  Don't check for race with close on advisory unlock (there is nothing smart we
  can do when such a race occurs). This saves lock/unlock cycle for the filedesc
  lock for every advisory unlock operation.
  
  MFC after:	1 month

Modified:
  head/sys/kern/kern_descrip.c

Modified: head/sys/kern/kern_descrip.c
==============================================================================
--- head/sys/kern/kern_descrip.c	Sun Jun 17 21:02:48 2012	(r237203)
+++ head/sys/kern/kern_descrip.c	Sun Jun 17 21:04:22 2012	(r237204)
@@ -668,7 +668,8 @@ kern_fcntl(struct thread *td, int fd, in
 		}
 		VFS_UNLOCK_GIANT(vfslocked);
 		vfslocked = 0;
-		if (error != 0) {
+		if (error != 0 || flp->l_type == F_UNLCK ||
+		    flp->l_type == F_UNLCKSYS) {
 			fdrop(fp, td);
 			break;
 		}