From 2463ab2d731f7334452f53b3408776a350b37192 Mon Sep 17 00:00:00 2001 From: Nickolai Zeldovich Date: Wed, 31 Jul 2002 04:42:07 +0000 Subject: [PATCH] STABLE12-make-mutex-tryenter-consistent-with-head-20020730 pullup change from head to MUTEX_TRYENTER --- src/rx/LINUX/rx_kmutex.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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) -- 2.39.5