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 3d09fc6ea8c04bffe9a3c17121b2af1a3fd2cf12..1ff5b700f2501866780ee383a4340e4633ce567a 100644 (file)
--- 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)