From: Sasha Levin <sashal@kernel.org>
Date: Sat, 23 Sep 2023 12:16:22 +0000 (-0400)
Subject: Fixes for 4.14
X-Git-Tag: v6.5.6~109
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5768a2d8b12a33cac92deb4739ace9b987d35d81;p=thirdparty%2Fkernel%2Fstable-queue.git

Fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.14/nfs-pnfs-report-einval-errors-from-connect-to-the-se.patch b/queue-4.14/nfs-pnfs-report-einval-errors-from-connect-to-the-se.patch
new file mode 100644
index 00000000000..9a88d948b16
--- /dev/null
+++ b/queue-4.14/nfs-pnfs-report-einval-errors-from-connect-to-the-se.patch
@@ -0,0 +1,36 @@
+From ca3ae8f7c25628fbc115ef30dfcc45e07d2f4e2a Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 4 Sep 2023 12:43:58 -0400
+Subject: NFS/pNFS: Report EINVAL errors from connect() to the server
+
+From: Trond Myklebust <trond.myklebust@hammerspace.com>
+
+[ Upstream commit dd7d7ee3ba2a70d12d02defb478790cf57d5b87b ]
+
+With IPv6, connect() can occasionally return EINVAL if a route is
+unavailable. If this happens during I/O to a data server, we want to
+report it using LAYOUTERROR as an inability to connect.
+
+Fixes: dd52128afdde ("NFSv4.1/pnfs Ensure flexfiles reports all connection related errors")
+Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
+Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ fs/nfs/flexfilelayout/flexfilelayout.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c
+index 9d99e19d98bdf..c87f3a7c5cdff 100644
+--- a/fs/nfs/flexfilelayout/flexfilelayout.c
++++ b/fs/nfs/flexfilelayout/flexfilelayout.c
+@@ -1195,6 +1195,7 @@ static void ff_layout_io_track_ds_error(struct pnfs_layout_segment *lseg,
+ 		case -EPFNOSUPPORT:
+ 		case -EPROTONOSUPPORT:
+ 		case -EOPNOTSUPP:
++		case -EINVAL:
+ 		case -ECONNREFUSED:
+ 		case -ECONNRESET:
+ 		case -EHOSTDOWN:
+-- 
+2.40.1
+
diff --git a/queue-4.14/series b/queue-4.14/series
new file mode 100644
index 00000000000..80b0e13f003
--- /dev/null
+++ b/queue-4.14/series
@@ -0,0 +1 @@
+nfs-pnfs-report-einval-errors-from-connect-to-the-se.patch