From owner-svn-soc-all@FreeBSD.ORG  Wed Aug  1 08:12:59 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 497B610656AD
	for <svn-soc-all@FreeBSD.org>; Wed,  1 Aug 2012 08:12:57 +0000 (UTC)
	(envelope-from gmiller@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Wed, 01 Aug 2012 08:12:57 +0000
Date: Wed, 01 Aug 2012 08:12:57 +0000
From: gmiller@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120801081257.497B610656AD@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r239981 - in soc2012/gmiller/locking-head: .
	lib/libwitness
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2012 08:12:59 -0000

Author: gmiller
Date: Wed Aug  1 08:12:56 2012
New Revision: 239981
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239981

Log:
   r240026@FreeBSD-dev:  root | 2012-07-24 09:15:58 -0500
   Reverse the parent->child order in the lock order graph in order to make it
   more intuitive.

Modified:
  soc2012/gmiller/locking-head/   (props changed)
  soc2012/gmiller/locking-head/lib/libwitness/lists.c
  soc2012/gmiller/locking-head/lib/libwitness/wrappers.c

Modified: soc2012/gmiller/locking-head/lib/libwitness/lists.c
==============================================================================
--- soc2012/gmiller/locking-head/lib/libwitness/lists.c	Wed Aug  1 05:53:20 2012	(r239980)
+++ soc2012/gmiller/locking-head/lib/libwitness/lists.c	Wed Aug  1 08:12:56 2012	(r239981)
@@ -73,7 +73,7 @@
 
 	SLIST_INSERT_HEAD(&lock_head, entry, lock_next);
 
-	if (next != NULL && insert_lock(entry->lock, next->lock) < 0) {
+	if (next != NULL && insert_lock(next->lock, entry->lock) < 0) {
 		log_reversal(entry->lock, next->lock);
 	}
 }

Modified: soc2012/gmiller/locking-head/lib/libwitness/wrappers.c
==============================================================================
--- soc2012/gmiller/locking-head/lib/libwitness/wrappers.c	Wed Aug  1 05:53:20 2012	(r239980)
+++ soc2012/gmiller/locking-head/lib/libwitness/wrappers.c	Wed Aug  1 08:12:56 2012	(r239981)
@@ -384,7 +384,7 @@
 
 	_pthread_mutex_lock(&witness_mtx);
 
-	if (insert_lock(lookup_lock(second), lookup_lock(first)) < 0) {
+	if (insert_lock(lookup_lock(first), lookup_lock(second)) < 0) {
 		ret = EINVAL;
 	}