NFSD: OP_CB_RECALL_ANY should recall both read and write delegations

daimngo · chucklever · commit 5826e09bf3dd · 2024-03-01T09:12:32.000-05:00
Add RCA4_TYPE_MASK_WDATA_DLG to ra_bmval bitmask of OP_CB_RECALL_ANY

Signed-off-by: Dai Ngo &lt;dai.ngo@oracle.com&gt;
Signed-off-by: Chuck Lever &lt;chuck.lever@oracle.com&gt;
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
@@ -6611,6 +6611,8 @@ deleg_reaper(struct nfsd_net *nn)
 		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);
 		nfsd4_run_cb(&clp->cl_ra->ra_cb);
 	}

Original file line number	Diff line number	Diff line change
`@@ -6611,6 +6611,8 @@ deleg_reaper(struct nfsd_net *nn)`
`6611`	`6611`	`list_del_init(&clp->cl_ra_cblist);`
`6612`	`6612`	`clp->cl_ra->ra_keep = 0;`
`6613`	`6613`	`clp->cl_ra->ra_bmval[0] = BIT(RCA4_TYPE_MASK_RDATA_DLG);`
	`6614`	`+ clp->cl_ra->ra_bmval[0] = BIT(RCA4_TYPE_MASK_RDATA_DLG) \|`
	`6615`	`+ BIT(RCA4_TYPE_MASK_WDATA_DLG);`
`6614`	`6616`	`trace_nfsd_cb_recall_any(clp->cl_ra);`
`6615`	`6617`	`nfsd4_run_cb(&clp->cl_ra->ra_cb);`
`6616`	`6618`	`}`