iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: lustre: remove wrappers for two atomic functions

Browse Source 
Just call them directly, like the rest of the kernel does.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-08-04 08:03:39 +08:00
parent c88a6cbb77
commit 305ec768ff
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
View File

@ -165,10 +165,4 @@ do { \
#define cfs_waitq_wait_event_interruptible_timeout(wq, c, timeout, ret) \
ret = wait_event_interruptible_timeout(wq, c, timeout)
/*
* atomic
*/
#define cfs_atomic_add_unless(atom, a, u) atomic_add_unless(atom, a, u)
#define cfs_atomic_cmpxchg(atom, old, nv) atomic_cmpxchg(atom, old, nv)
#endif

2
drivers/staging/lustre/lustre/llite/lproc_llite.c
View File

@ -419,7 +419,7 @@ static ssize_t ll_max_cached_mb_seq_write(struct file *file, const char *buffer,
break;
nv = ov > diff ? ov - diff : 0;
rc = cfs_atomic_cmpxchg(&cache->ccc_lru_left, ov, nv);
rc = atomic_cmpxchg(&cache->ccc_lru_left, ov, nv);
if (likely(ov == rc)) {
diff -= ov - nv;
nrpages += ov - nv;

2
drivers/staging/lustre/lustre/osc/osc_page.c
View File

@ -881,7 +881,7 @@ static int osc_lru_reserve(const struct lu_env *env, struct osc_object *obj,
return 0;
LASSERT(atomic_read(cli->cl_lru_left) >= 0);
while (!cfs_atomic_add_unless(cli->cl_lru_left, -1, 0)) {
while (!atomic_add_unless(cli->cl_lru_left, -1, 0)) {
int gen;
/* run out of LRU spaces, try to drop some by itself */