Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-3963 libcfs: convert DT objects atomic primitives
[fs/lustre-release.git]
/
lustre
/
osc
/
osc_io.c
diff --git
a/lustre/osc/osc_io.c
b/lustre/osc/osc_io.c
index
3ded607
..
8724520
100644
(file)
--- a/
lustre/osc/osc_io.c
+++ b/
lustre/osc/osc_io.c
@@
-331,15
+331,15
@@
static int osc_io_rw_iter_init(const struct lu_env *env,
if (npages > max_pages)
npages = max_pages;
if (npages > max_pages)
npages = max_pages;
- c =
cfs_
atomic_read(cli->cl_lru_left);
+ c = atomic_read(cli->cl_lru_left);
if (c < npages && osc_lru_reclaim(cli) > 0)
if (c < npages && osc_lru_reclaim(cli) > 0)
- c =
cfs_
atomic_read(cli->cl_lru_left);
+ c = atomic_read(cli->cl_lru_left);
while (c >= npages) {
while (c >= npages) {
- if (c ==
cfs_
atomic_cmpxchg(cli->cl_lru_left, c, c - npages)) {
+ if (c == atomic_cmpxchg(cli->cl_lru_left, c, c - npages)) {
oio->oi_lru_reserved = npages;
break;
}
oio->oi_lru_reserved = npages;
break;
}
- c =
cfs_
atomic_read(cli->cl_lru_left);
+ c = atomic_read(cli->cl_lru_left);
}
RETURN(0);
}
RETURN(0);
@@
-353,7
+353,7
@@
static void osc_io_rw_iter_fini(const struct lu_env *env,
struct client_obd *cli = osc_cli(osc);
if (oio->oi_lru_reserved > 0) {
struct client_obd *cli = osc_cli(osc);
if (oio->oi_lru_reserved > 0) {
-
cfs_
atomic_add(oio->oi_lru_reserved, cli->cl_lru_left);
+ atomic_add(oio->oi_lru_reserved, cli->cl_lru_left);
oio->oi_lru_reserved = 0;
}
}
oio->oi_lru_reserved = 0;
}
}