From owner-svn-src-stable-7@FreeBSD.ORG  Tue Jun 23 10:41:38 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A5B421065670;
	Tue, 23 Jun 2009 10:41:38 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 933DD8FC1F;
	Tue, 23 Jun 2009 10:41:38 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5NAfcaY073483;
	Tue, 23 Jun 2009 10:41:38 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5NAfcYn073481;
	Tue, 23 Jun 2009 10:41:38 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200906231041.n5NAfcYn073481@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Tue, 23 Jun 2009 10:41:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194692 - in stable/7/sys: . contrib/pf kern
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Jun 2009 10:41:39 -0000

Author: kib
Date: Tue Jun 23 10:41:38 2009
New Revision: 194692
URL: http://svn.freebsd.org/changeset/base/194692

Log:
  MFC r192681:
  Replace the while statement with the if for clarity. The loop body
  cannot be executed more then once.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/kern/kern_lockf.c

Modified: stable/7/sys/kern/kern_lockf.c
==============================================================================
--- stable/7/sys/kern/kern_lockf.c	Tue Jun 23 10:37:28 2009	(r194691)
+++ stable/7/sys/kern/kern_lockf.c	Tue Jun 23 10:41:38 2009	(r194692)
@@ -1361,7 +1361,7 @@ lf_setlock(struct lockf *state, struct l
 	/*
 	 * Scan lock list for this file looking for locks that would block us.
 	 */
-	while (lf_getblock(state, lock)) {
+	if (lf_getblock(state, lock)) {
 		/*
 		 * Free the structure and return if nonblocking.
 		 */