* [PATCH] NFSD: remove redundant assignment operation
@ 2024-08-14 11:29 Li Lingfeng
2024-08-14 11:55 ` Jeff Layton
2024-08-14 13:35 ` Chuck Lever
0 siblings, 2 replies; 3+ messages in thread
From: Li Lingfeng @ 2024-08-14 11:29 UTC (permalink / raw)
To: chuck.lever, jlayton, neilb, kolga, Dai.Ngo, tom, linux-nfs,
linux-kernel
Cc: yukuai1, houtao1, yi.zhang, yangerkun, lilingfeng, lilingfeng3
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] NFSD: remove redundant assignment operation
2024-08-14 11:29 [PATCH] NFSD: remove redundant assignment operation Li Lingfeng
@ 2024-08-14 11:55 ` Jeff Layton
2024-08-14 13:35 ` Chuck Lever
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Layton @ 2024-08-14 11:55 UTC (permalink / raw)
To: Li Lingfeng, chuck.lever, neilb, kolga, Dai.Ngo, tom, linux-nfs,
linux-kernel
Cc: yukuai1, houtao1, yi.zhang, yangerkun, lilingfeng3
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>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] NFSD: remove redundant assignment operation
2024-08-14 11:29 [PATCH] NFSD: remove redundant assignment operation Li Lingfeng
2024-08-14 11:55 ` Jeff Layton
@ 2024-08-14 13:35 ` Chuck Lever
1 sibling, 0 replies; 3+ messages in thread
From: Chuck Lever @ 2024-08-14 13:35 UTC (permalink / raw)
To: Li Lingfeng
Cc: jlayton, neilb, kolga, Dai.Ngo, tom, linux-nfs, linux-kernel,
yukuai1, houtao1, yi.zhang, yangerkun, lilingfeng3
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-08-14 13:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-08-14 11:29 [PATCH] NFSD: remove redundant assignment operation Li Lingfeng
2024-08-14 11:55 ` Jeff Layton
2024-08-14 13:35 ` Chuck Lever
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®