NFSD: remove redundant assignment operation
authorLi Lingfeng <lilingfeng3@huawei.com>
Wed, 14 Aug 2024 11:29:07 +0000 (19:29 +0800)
committerChuck Lever <chuck.lever@oracle.com>
Fri, 20 Sep 2024 23:31:03 +0000 (19:31 -0400)
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.

Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
fs/nfsd/nfs4state.c

index 6eb61b6e4ac105f4545c8e793539974f6680faed..fa58de23a753e098b1e6797693a916faae35ed40 100644 (file)
@@ -6643,7 +6643,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);