|
@@ -825,7 +825,7 @@ __nfs4_find_lock_state(struct nfs4_state *state,
|
|
|
ret = pos;
|
|
|
}
|
|
|
if (ret)
|
|
|
- atomic_inc(&ret->ls_count);
|
|
|
+ refcount_inc(&ret->ls_count);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -843,7 +843,7 @@ static struct nfs4_lock_state *nfs4_alloc_lock_state(struct nfs4_state *state, f
|
|
|
if (lsp == NULL)
|
|
|
return NULL;
|
|
|
nfs4_init_seqid_counter(&lsp->ls_seqid);
|
|
|
- atomic_set(&lsp->ls_count, 1);
|
|
|
+ refcount_set(&lsp->ls_count, 1);
|
|
|
lsp->ls_state = state;
|
|
|
lsp->ls_owner = fl_owner;
|
|
|
lsp->ls_seqid.owner_id = ida_simple_get(&server->lockowner_id, 0, 0, GFP_NOFS);
|
|
@@ -907,7 +907,7 @@ void nfs4_put_lock_state(struct nfs4_lock_state *lsp)
|
|
|
if (lsp == NULL)
|
|
|
return;
|
|
|
state = lsp->ls_state;
|
|
|
- if (!atomic_dec_and_lock(&lsp->ls_count, &state->state_lock))
|
|
|
+ if (!refcount_dec_and_lock(&lsp->ls_count, &state->state_lock))
|
|
|
return;
|
|
|
list_del(&lsp->ls_locks);
|
|
|
if (list_empty(&state->lock_states))
|
|
@@ -927,7 +927,7 @@ static void nfs4_fl_copy_lock(struct file_lock *dst, struct file_lock *src)
|
|
|
struct nfs4_lock_state *lsp = src->fl_u.nfs4_fl.owner;
|
|
|
|
|
|
dst->fl_u.nfs4_fl.owner = lsp;
|
|
|
- atomic_inc(&lsp->ls_count);
|
|
|
+ refcount_inc(&lsp->ls_count);
|
|
|
}
|
|
|
|
|
|
static void nfs4_fl_release_lock(struct file_lock *fl)
|