nfs: Directly use ida_alloc()/free()
Subsystems (2)
PATCH 1/1 nfs: Directly use ida_alloc()/free()
Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove() .
Signed-off-by keliu <[email protected]>
--- fs/nfs/nfs4state.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/nfs/nfs4state.c +5 -5
@@ -497,7 +497,7 @@ nfs4_alloc_state_owner(struct nfs_server *server, sp =kzalloc (sizeof (*sp), gfp_flags);if (!sp)return NULL ; - sp->so_seqid.owner_id =ida_simple_get (&server->openowner_id,0 ,0 , + sp->so_seqid.owner_id =ida_alloc (&server->openowner_id, gfp_flags);if (sp->so_seqid.owner_id <0 ) {kfree (sp);
@@ -534,7 +534,7 @@ static void nfs4_free_state_owner(struct nfs4_state_owner *sp) {nfs4_destroy_seqid_counter (&sp->so_seqid);put_cred (sp->so_cred); -ida_simple_remove (&sp->so_server->openowner_id, sp->so_seqid.owner_id); +ida_free (&sp->so_server->openowner_id, sp->so_seqid.owner_id);kfree (sp); }
@@ -877,8 +877,8 @@ static struct nfs4_lock_state *nfs4_alloc_lock_state(struct nfs4_state *state, frefcount_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_KERNEL_ACCOUNT ); + lsp->ls_seqid.owner_id =ida_alloc (&server->lockowner_id, +GFP_KERNEL_ACCOUNT );if (lsp->ls_seqid.owner_id <0 ) goto out_free;INIT_LIST_HEAD (&lsp->ls_locks);
@@ -890,7 +890,7 @@ static struct nfs4_lock_state *nfs4_alloc_lock_state(struct nfs4_state *state, fvoid nfs4_free_lock_state (struct nfs_server *server,struct nfs4_lock_state *lsp) { -ida_simple_remove (&server->lockowner_id, lsp->ls_seqid.owner_id); +ida_free (&server->lockowner_id, lsp->ls_seqid.owner_id);nfs4_destroy_seqid_counter (&lsp->ls_seqid);kfree (lsp); }
Signature · 1 line
2.25.1