From: Nickolai Zeldovich <kolya@mit.edu>
Date: Wed, 31 Jul 2002 04:42:07 +0000 (+0000)
Subject: STABLE12-make-mutex-tryenter-consistent-with-head-20020730
X-Git-Tag: openafs-stable-1_2_6~17
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2463ab2d731f7334452f53b3408776a350b37192;p=packages%2Fo%2Fopenafs.git

STABLE12-make-mutex-tryenter-consistent-with-head-20020730


pullup change from head to MUTEX_TRYENTER
---

diff --git a/src/rx/LINUX/rx_kmutex.h b/src/rx/LINUX/rx_kmutex.h
index 3d09fc6ea..1ff5b700f 100644
--- a/src/rx/LINUX/rx_kmutex.h
+++ b/src/rx/LINUX/rx_kmutex.h
@@ -75,12 +75,10 @@ static inline void MUTEX_ENTER(afs_kmutex_t *l)
 /* And how to do a good tryenter? */
 static inline int MUTEX_TRYENTER(afs_kmutex_t *l)
 {
-    if (!l->owner) {
-	MUTEX_ENTER(l);
-	return 1;
-    }
-    else
-	return 0;
+    if (down_trylock(&l->sem))
+        return 0;
+    l->owner = current->pid;
+    return 1;
 }
 
 static inline void MUTEX_EXIT(afs_kmutex_t *l)