NFS: Fix READ_PLUS when server doesn't support OP_READ_PLUS

Olga showed me a case where the client was sending multiple READ_PLUS
calls to the server in parallel, and the server replied
NFS4ERR_OPNOTSUPP to each. The client would fall back to READ for the
first reply, but fail to retry the other calls.

I fix this by removing the test for NFS_CAP_READ_PLUS in
nfs4_read_plus_not_supported(). This allows us to reschedule any
READ_PLUS call that has a NFS4ERR_OPNOTSUPP return value, even after the
capability has been cleared.

Reported-by: Olga Kornievskaia <kolga@netapp.com>
Fixes: c567552612ec ("NFS: Add READ_PLUS data segment support")
Cc: stable@vger.kernel.org # v5.10+
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index ea390db94b622f5332f5126ea15f95bc8131344e..c93c12063b3af207f61f7d7572481d4fc439b0aa 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5456,7 +5456,7 @@ static bool nfs4_read_plus_not_supported(struct rpc_task *task,
        struct rpc_message *msg = &task->tk_msg;
 
        if (msg->rpc_proc == &nfs4_procedures[NFSPROC4_CLNT_READ_PLUS] &&
-           server->caps & NFS_CAP_READ_PLUS && task->tk_status == -ENOTSUPP) {
+           task->tk_status == -ENOTSUPP) {
                server->caps &= ~NFS_CAP_READ_PLUS;
                msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READ];
                rpc_restart_call_prepare(task);