|
@@ -338,7 +338,7 @@ print_ds(struct nfs4_pnfs_ds *ds)
|
|
|
" client %p\n"
|
|
|
" cl_exchange_flags %x\n",
|
|
|
ds->ds_remotestr,
|
|
|
- atomic_read(&ds->ds_count), ds->ds_clp,
|
|
|
+ refcount_read(&ds->ds_count), ds->ds_clp,
|
|
|
ds->ds_clp ? ds->ds_clp->cl_exchange_flags : 0);
|
|
|
}
|
|
|
|
|
@@ -451,7 +451,7 @@ static void destroy_ds(struct nfs4_pnfs_ds *ds)
|
|
|
|
|
|
void nfs4_pnfs_ds_put(struct nfs4_pnfs_ds *ds)
|
|
|
{
|
|
|
- if (atomic_dec_and_lock(&ds->ds_count,
|
|
|
+ if (refcount_dec_and_lock(&ds->ds_count,
|
|
|
&nfs4_ds_cache_lock)) {
|
|
|
list_del_init(&ds->ds_node);
|
|
|
spin_unlock(&nfs4_ds_cache_lock);
|
|
@@ -537,7 +537,7 @@ nfs4_pnfs_ds_add(struct list_head *dsaddrs, gfp_t gfp_flags)
|
|
|
INIT_LIST_HEAD(&ds->ds_addrs);
|
|
|
list_splice_init(dsaddrs, &ds->ds_addrs);
|
|
|
ds->ds_remotestr = remotestr;
|
|
|
- atomic_set(&ds->ds_count, 1);
|
|
|
+ refcount_set(&ds->ds_count, 1);
|
|
|
INIT_LIST_HEAD(&ds->ds_node);
|
|
|
ds->ds_clp = NULL;
|
|
|
list_add(&ds->ds_node, &nfs4_data_server_cache);
|
|
@@ -546,10 +546,10 @@ nfs4_pnfs_ds_add(struct list_head *dsaddrs, gfp_t gfp_flags)
|
|
|
} else {
|
|
|
kfree(remotestr);
|
|
|
kfree(ds);
|
|
|
- atomic_inc(&tmp_ds->ds_count);
|
|
|
+ refcount_inc(&tmp_ds->ds_count);
|
|
|
dprintk("%s data server %s found, inc'ed ds_count to %d\n",
|
|
|
__func__, tmp_ds->ds_remotestr,
|
|
|
- atomic_read(&tmp_ds->ds_count));
|
|
|
+ refcount_read(&tmp_ds->ds_count));
|
|
|
ds = tmp_ds;
|
|
|
}
|
|
|
spin_unlock(&nfs4_ds_cache_lock);
|