From owner-svn-src-stable@FreeBSD.ORG  Tue Feb 14 19:08:22 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 095381065687;
	Tue, 14 Feb 2012 19:08:22 +0000 (UTC)
	(envelope-from trociny@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EBFC78FC23;
	Tue, 14 Feb 2012 19:08:21 +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 q1EJ8Ll5013603;
	Tue, 14 Feb 2012 19:08:21 GMT (envelope-from trociny@svn.freebsd.org)
Received: (from trociny@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1EJ8LGU013601;
	Tue, 14 Feb 2012 19:08:21 GMT (envelope-from trociny@svn.freebsd.org)
Message-Id: <201202141908.q1EJ8LGU013601@svn.freebsd.org>
From: Mikolaj Golub <trociny@FreeBSD.org>
Date: Tue, 14 Feb 2012 19:08:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231700 - stable/9/sbin/hastd
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Feb 2012 19:08:22 -0000

Author: trociny
Date: Tue Feb 14 19:08:21 2012
New Revision: 231700
URL: http://svn.freebsd.org/changeset/base/231700

Log:
  MFC r231525 (pjd):
  
  Nice range comparison.

Modified:
  stable/9/sbin/hastd/rangelock.c
Directory Properties:
  stable/9/sbin/hastd/   (props changed)

Modified: stable/9/sbin/hastd/rangelock.c
==============================================================================
--- stable/9/sbin/hastd/rangelock.c	Tue Feb 14 18:57:10 2012	(r231699)
+++ stable/9/sbin/hastd/rangelock.c	Tue Feb 14 19:08:21 2012	(r231700)
@@ -128,15 +128,13 @@ bool
 rangelock_islocked(struct rangelocks *rls, off_t offset, off_t length)
 {
 	struct rlock *rl;
+	off_t end;
 
 	PJDLOG_ASSERT(rls->rls_magic == RANGELOCKS_MAGIC);
 
+	end = offset + length;
 	TAILQ_FOREACH(rl, &rls->rls_locks, rl_next) {
-		if (rl->rl_start >= offset && rl->rl_start < offset + length)
-			break;
-		else if (rl->rl_end > offset && rl->rl_end <= offset + length)
-			break;
-		else if (rl->rl_start < offset && rl->rl_end > offset + length)
+		if (rl->rl_start < end && rl->rl_end > offset)
 			break;
 	}
 	return (rl != NULL);