Received-SPF: pass (google.com: domain of linux-nfs+bounces-1823-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Olga Kornievskaia <olga.kornievskaia@gmail.com>
To: trond.myklebust@hammerspace.com,
	anna.schumaker@netapp.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH 1/1] NFSv4.1/pnfs: error gracefully on partial pnfs layout
Date: Wed,  7 Feb 2024 13:29:12 -0500
Message-Id: <20240207182912.30981-1-olga.kornievskaia@gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

From: Olga Kornievskaia <kolga@netapp.com>

Currently, if the server returns a partial layout, the client gets
stuck asking for a layout indefinitely. Until we add support for
partial layouts, treat partial layout as layout unavailable error.

Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
---
 fs/nfs/nfs4proc.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index dae4c1b6cc1c..108bc7f3e8c2 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -9790,6 +9790,12 @@ nfs4_proc_layoutget(struct nfs4_layoutget *lgp,
 	if (status != 0)
 		goto out;
 
+	/* Since client does not support partial pnfs layout, then treat
+	 * getting a partial layout as LAYOUTUNAVAILABLE error
+	 */
+	if (lgp->args.range.length != lgp->res.range.length)
+		task->tk_status = -NFS4ERR_LAYOUTUNAVAILABLE;
+
 	if (task->tk_status < 0) {
 		exception->retry = 1;
 		status = nfs4_layoutget_handle_exception(task, lgp, exception);
-- 
2.39.1