NFSD: remove redundant assignment operation

[PATCH] NFSD: remove redundant assignment operation

Posted by Li Lingfeng 1 year, 5 months ago

From: Li Lingfeng <lilingfeng3@huawei.com>

Commit 5826e09bf3dd ("NFSD: OP_CB_RECALL_ANY should recall both read and
write delegations") added a new assignment statement to add
RCA4_TYPE_MASK_WDATA_DLG to ra_bmval bitmask of OP_CB_RECALL_ANY. So the
old one should be removed.

Fixes: 5826e09bf3dd ("NFSD: OP_CB_RECALL_ANY should recall both read and write delegations")
Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com>
---
 fs/nfsd/nfs4state.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index a20c2c9d7d45..693f7813a49c 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -6644,7 +6644,6 @@ deleg_reaper(struct nfsd_net *nn)
 					cl_ra_cblist);
 		list_del_init(&clp->cl_ra_cblist);
 		clp->cl_ra->ra_keep = 0;
-		clp->cl_ra->ra_bmval[0] = BIT(RCA4_TYPE_MASK_RDATA_DLG);
 		clp->cl_ra->ra_bmval[0] = BIT(RCA4_TYPE_MASK_RDATA_DLG) |
 						BIT(RCA4_TYPE_MASK_WDATA_DLG);
 		trace_nfsd_cb_recall_any(clp->cl_ra);
-- 
2.31.1

Re: [PATCH] NFSD: remove redundant assignment operation

Posted by Chuck Lever 1 year, 5 months ago

On Wed, Aug 14, 2024 at 07:29:07PM +0800, Li Lingfeng wrote:
> From: Li Lingfeng <lilingfeng3@huawei.com>
> 
> Commit 5826e09bf3dd ("NFSD: OP_CB_RECALL_ANY should recall both read and
> write delegations") added a new assignment statement to add
> RCA4_TYPE_MASK_WDATA_DLG to ra_bmval bitmask of OP_CB_RECALL_ANY. So the
> old one should be removed.
> 
> Fixes: 5826e09bf3dd ("NFSD: OP_CB_RECALL_ANY should recall both read and write delegations")
> Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com>
> ---
>  fs/nfsd/nfs4state.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index a20c2c9d7d45..693f7813a49c 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -6644,7 +6644,6 @@ deleg_reaper(struct nfsd_net *nn)
>  					cl_ra_cblist);
>  		list_del_init(&clp->cl_ra_cblist);
>  		clp->cl_ra->ra_keep = 0;
> -		clp->cl_ra->ra_bmval[0] = BIT(RCA4_TYPE_MASK_RDATA_DLG);
>  		clp->cl_ra->ra_bmval[0] = BIT(RCA4_TYPE_MASK_RDATA_DLG) |
>  						BIT(RCA4_TYPE_MASK_WDATA_DLG);
>  		trace_nfsd_cb_recall_any(clp->cl_ra);
> -- 
> 2.31.1
> 

Applied and pushed to nfsd-next for v6.12.

But I removed the Fixes: tag:
 - This is a clean-up only, so no need to trigger a stable backport
 - The culprit commit is mentioned in the description already

-- 
Chuck Lever

Re: [PATCH] NFSD: remove redundant assignment operation

Posted by Jeff Layton 1 year, 5 months ago

On Wed, 2024-08-14 at 19:29 +0800, Li Lingfeng wrote:
> From: Li Lingfeng <lilingfeng3@huawei.com>
> 
> Commit 5826e09bf3dd ("NFSD: OP_CB_RECALL_ANY should recall both read and
> write delegations") added a new assignment statement to add
> RCA4_TYPE_MASK_WDATA_DLG to ra_bmval bitmask of OP_CB_RECALL_ANY. So the
> old one should be removed.
> 
> Fixes: 5826e09bf3dd ("NFSD: OP_CB_RECALL_ANY should recall both read and write delegations")
> Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com>
> ---
>  fs/nfsd/nfs4state.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index a20c2c9d7d45..693f7813a49c 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -6644,7 +6644,6 @@ deleg_reaper(struct nfsd_net *nn)
>  					cl_ra_cblist);
>  		list_del_init(&clp->cl_ra_cblist);
>  		clp->cl_ra->ra_keep = 0;
> -		clp->cl_ra->ra_bmval[0] = BIT(RCA4_TYPE_MASK_RDATA_DLG);
>  		clp->cl_ra->ra_bmval[0] = BIT(RCA4_TYPE_MASK_RDATA_DLG) |
>  						BIT(RCA4_TYPE_MASK_WDATA_DLG);
>  		trace_nfsd_cb_recall_any(clp->cl_ra);

Good catch!

Reviewed-by: Jeff Layton <jlayton@kernel.org>