X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosc%2Fosc_io.c;h=87245204a50e70be58b63f5f0914318d1f1a8417;hb=342c14842fa996181e5d5764701585b1b2f6d6cb;hp=3ded60776cb2cce4cad80c4f54eab5896546ee7c;hpb=df1d59429cbfd1ea2464e863458b6a4a268e516b;p=fs%2Flustre-release.git diff --git a/lustre/osc/osc_io.c b/lustre/osc/osc_io.c index 3ded607..8724520 100644 --- 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; - c = cfs_atomic_read(cli->cl_lru_left); + c = atomic_read(cli->cl_lru_left); 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) { - 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; } - c = cfs_atomic_read(cli->cl_lru_left); + c = atomic_read(cli->cl_lru_left); } 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) { - 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; } }