diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-06-26 16:35:44 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-06-26 16:35:44 +0100 |
| commit | 62ed948cb1405fe95d61d8c6445c102e0c9da0a6 (patch) | |
| tree | f139adcc861a05e7cc09cdb387a271a652fc2d07 /fs/xfs/linux-2.6/sema.h | |
| parent | 17ffc7ba6d7ea68b8d5f55a5ca1b87163e69720d (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
| download | kernel-crypto-62ed948cb1405fe95d61d8c6445c102e0c9da0a6.tar.gz kernel-crypto-62ed948cb1405fe95d61d8c6445c102e0c9da0a6.tar.xz kernel-crypto-62ed948cb1405fe95d61d8c6445c102e0c9da0a6.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/xfs/linux-2.6/sema.h')
| -rw-r--r-- | fs/xfs/linux-2.6/sema.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/fs/xfs/linux-2.6/sema.h b/fs/xfs/linux-2.6/sema.h index 194a84490bd..b25090094cc 100644 --- a/fs/xfs/linux-2.6/sema.h +++ b/fs/xfs/linux-2.6/sema.h @@ -34,20 +34,21 @@ typedef struct semaphore sema_t; #define initnsema(sp, val, name) sema_init(sp, val) #define psema(sp, b) down(sp) #define vsema(sp) up(sp) -#define valusema(sp) (atomic_read(&(sp)->count)) -#define freesema(sema) +#define freesema(sema) do { } while (0) + +static inline int issemalocked(sema_t *sp) +{ + return down_trylock(sp) || (up(sp), 0); +} /* * Map cpsema (try to get the sema) to down_trylock. We need to switch * the return values since cpsema returns 1 (acquired) 0 (failed) and * down_trylock returns the reverse 0 (acquired) 1 (failed). */ - -#define cpsema(sp) (down_trylock(sp) ? 0 : 1) - -/* - * Didn't do cvsema(sp). Not sure how to map this to up/down/... - * It does a vsema if the values is < 0 other wise nothing. - */ +static inline int cpsema(sema_t *sp) +{ + return down_trylock(sp) ? 0 : 1; +} #endif /* __XFS_SUPPORT_SEMA_H__ */ |