diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2022-06-09 14:39:55 -0400 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2022-06-09 14:39:55 -0400 |
| commit | ea28214f21dc64ec385bdcf962806c9d93a9e7e6 (patch) | |
| tree | 7b2c0a3cee0dbfc03fab08c31c44b16dd3cbba5f | |
| parent | Linux patch 5.18.3 (diff) | |
| download | linux-patches-ea28214f21dc64ec385bdcf962806c9d93a9e7e6.tar.gz linux-patches-ea28214f21dc64ec385bdcf962806c9d93a9e7e6.tar.bz2 linux-patches-ea28214f21dc64ec385bdcf962806c9d93a9e7e6.zip | |
cifs: fix minor compile warning5.18-6
Bug: https://bugs.gentoo.org/85076
Signed-off-by: Mike Pagano <mpagano@gentoo.org>
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 1950_cifs-fix-minor-compile-warning.patch | 33 |
2 files changed, 37 insertions, 0 deletions
diff --git a/0000_README b/0000_README index 5acbe17f..01987387 100644 --- a/0000_README +++ b/0000_README @@ -67,6 +67,10 @@ Patch: 1700_sparc-address-warray-bound-warnings.patch From: https://github.com/KSPP/linux/issues/109 Desc: Address -Warray-bounds warnings +Patch: 1950_cifs-fix-minor-compile-warning.patch +From: https://git.kernel.org/ +Desc: cifs: fix minor compile warning + Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch From: https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@holtmann.org/raw Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758 diff --git a/1950_cifs-fix-minor-compile-warning.patch b/1950_cifs-fix-minor-compile-warning.patch new file mode 100644 index 00000000..65787238 --- /dev/null +++ b/1950_cifs-fix-minor-compile-warning.patch @@ -0,0 +1,33 @@ +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 + +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> +--- + fs/cifs/connect.c | 2 ++ + 1 file changed, 2 insertions(+) + +(limited to 'fs/cifs/connect.c') + +diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c +index 44dc66f21d832..0b08693d1af8f 100644 +--- a/fs/cifs/connect.c ++++ b/fs/cifs/connect.c +@@ -3433,7 +3433,9 @@ static int is_path_remote(struct mount_ctx *mnt_ctx) + 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; +-- +cgit 1.2.3-1.el7 + |