NFSv4: Directly use ida_alloc()/free()

[PATCH] NFSv4: Directly use ida_alloc()/free()

Posted by Bo Liu 3 years, 10 months ago

Use ida_alloc()/ida_free() instead of
ida_simple_get()/ida_simple_remove().
The latter is deprecated and more verbose.

Signed-off-by: Bo Liu <liubo03@inspur.com>
---
 fs/nfs/nfs4state.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 2540b35ec187..8f018d4d35d7 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -497,8 +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,
-						gfp_flags);
+	sp->so_seqid.owner_id = ida_alloc(&server->openowner_id, gfp_flags);
 	if (sp->so_seqid.owner_id < 0) {
 		kfree(sp);
 		return NULL;
@@ -534,7 +533,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 +876,7 @@ static struct nfs4_lock_state *nfs4_alloc_lock_state(struct nfs4_state *state, f
 	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_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 +888,7 @@ static struct nfs4_lock_state *nfs4_alloc_lock_state(struct nfs4_state *state, f
 
 void 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);
 }
-- 
2.27.0

Re: [PATCH] NFSv4: Directly use ida_alloc()/free()

Posted by Christophe JAILLET 3 years, 10 months ago

Le 15/06/2022 à 08:27, Bo Liu a écrit :
> Use ida_alloc()/ida_free() instead of
> ida_simple_get()/ida_simple_remove().
> The latter is deprecated and more verbose.
> 
> Signed-off-by: Bo Liu <liubo03@inspur.com>

Hi,
for what it's worth:

Reviewed-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

> ---
>   fs/nfs/nfs4state.c | 10 ++++------
>   1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
> index 2540b35ec187..8f018d4d35d7 100644
> --- a/fs/nfs/nfs4state.c
> +++ b/fs/nfs/nfs4state.c
> @@ -497,8 +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,
> -						gfp_flags);
> +	sp->so_seqid.owner_id = ida_alloc(&server->openowner_id, gfp_flags);
>   	if (sp->so_seqid.owner_id < 0) {
>   		kfree(sp);
>   		return NULL;
> @@ -534,7 +533,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 +876,7 @@ static struct nfs4_lock_state *nfs4_alloc_lock_state(struct nfs4_state *state, f
>   	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_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 +888,7 @@ static struct nfs4_lock_state *nfs4_alloc_lock_state(struct nfs4_state *state, f
>   
>   void 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);
>   }