5.18-stable patches

added patches:
	cifs-fix-minor-compile-warning.patch

diff --git a/queue-5.18/cifs-fix-minor-compile-warning.patch b/queue-5.18/cifs-fix-minor-compile-warning.patch
new file mode 100644 (file)
index 0000000..b545f38
--- /dev/null
+++ b/queue-5.18/cifs-fix-minor-compile-warning.patch
@@ -0,0 +1,32 @@
+From 93ed91c020aa4f021600a633f1f87790a5e50b91 Mon Sep 17 00:00:00 2001
+From: Steve French <stfrench@microsoft.com>
+Date: Sun, 22 May 2022 21:25:24 -0500
+Subject: cifs: fix minor compile warning
+
+From: Steve French <stfrench@microsoft.com>
+
+commit 93ed91c020aa4f021600a633f1f87790a5e50b91 upstream.
+
+Add ifdef around nodfs variable from patch:
+  "cifs: don't call cifs_dfs_query_info_nonascii_quirk() if nodfs was set"
+which is unused when CONFIG_DFS_UPCALL is not set.
+
+Signed-off-by: Steve French <stfrench@microsoft.com>
+Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/cifs/connect.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/fs/cifs/connect.c
++++ b/fs/cifs/connect.c
+@@ -3423,7 +3423,9 @@ static int is_path_remote(struct mount_c
+       struct cifs_tcon *tcon = mnt_ctx->tcon;
+       struct smb3_fs_context *ctx = mnt_ctx->fs_ctx;
+       char *full_path;
++#ifdef CONFIG_CIFS_DFS_UPCALL
+       bool nodfs = cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_DFS;
++#endif
+ 
+       if (!server->ops->is_path_accessible)
+               return -EOPNOTSUPP;

diff --git a/queue-5.18/series b/queue-5.18/series
index 023f7c11a9bf56a21bd0cb08bef21bec9ec7b592..e6bef3d4688a2a3aeaf701952067c062f69e8012 100644 (file)
--- a/queue-5.18/series
+++ b/queue-5.18/series
@@ -78,3 +78,4 @@ ipv6-sit-fix-ipip6_tunnel_get_prl-return-value.patch
 ipv6-fix-lockdep-splat-in-in6_dump_addrs.patch
 mlxsw-spectrum_router-fix-rollback-in-tunnel-next-hop-init.patch
 net-tun-avoid-disabling-napi-twice.patch
+cifs-fix-minor-compile-warning.patch