Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulo Alcantara <palcantara@suse.de>2019-03-20 11:13:08 -0300
committerPaulo Alcantara <palcantara@suse.de>2019-03-20 14:36:34 -0300
commita1f6570f1acfa86054386c0339819123d44d834d (patch)
treeaff8d531578036a3e476592d8539a04e485e84c4
parent385bd76aee84abcd5191456a250110108e62a0ff (diff)
smb3: remove noisy warning message on mount (bsc#1129664).
-rw-r--r--patches.fixes/smb3-remove-noisy-warning-message-on-mount.patch39
-rw-r--r--series.conf1
2 files changed, 40 insertions, 0 deletions
diff --git a/patches.fixes/smb3-remove-noisy-warning-message-on-mount.patch b/patches.fixes/smb3-remove-noisy-warning-message-on-mount.patch
new file mode 100644
index 0000000000..056275b837
--- /dev/null
+++ b/patches.fixes/smb3-remove-noisy-warning-message-on-mount.patch
@@ -0,0 +1,39 @@
+From c3ed44026cd07fda5976ecb79225759901a160b4 Mon Sep 17 00:00:00 2001
+From: Steve French <stfrench@microsoft.com>
+Date: Thu, 28 Jun 2018 22:53:39 -0500
+Subject: [PATCH] smb3: remove noisy warning message on mount
+Git-commit: c3ed44026cd07fda5976ecb79225759901a160b4
+Patch-mainline: v4.19-rc1
+References: bsc#1129664
+
+Some servers, like Samba, don't support the fsctl for
+query_network_interface_info so don't log a noisy warning
+message on mount for this by default unless the error is more serious.
+Lower the error to an FYI level so it does not get logged by
+default.
+
+Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
+Reviewed-by: Aurelien Aptel <aaptel@suse.com>
+Signed-off-by: Steve French <stfrench@microsoft.com>
+Acked-by: Paulo Alcantara <palcantara@suse.de>
+---
+ fs/cifs/smb2ops.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/fs/cifs/smb2ops.c
++++ b/fs/cifs/smb2ops.c
+@@ -286,9 +286,12 @@ SMB3_request_interfaces(const unsigned i
+ FSCTL_QUERY_NETWORK_INTERFACE_INFO, true /* is_fsctl */,
+ NULL /* no data input */, 0 /* no data input */,
+ (char **)&out_buf, &ret_data_len);
+- if (rc != 0)
++ if (rc == -EOPNOTSUPP) {
++ cifs_dbg(FYI,
++ "server does not support query network interfaces\n");
++ } else if (rc != 0) {
+ cifs_dbg(VFS, "error %d on ioctl to get interface list\n", rc);
+- else if (ret_data_len < sizeof(struct network_interface_info_ioctl_rsp)) {
++ } else if (ret_data_len < sizeof(struct network_interface_info_ioctl_rsp)) {
+ cifs_dbg(VFS, "server returned bad net interface info buf\n");
+ rc = -EINVAL;
+ } else {
diff --git a/series.conf b/series.conf
index 444ac8f975..8f2d7aab3f 100644
--- a/series.conf
+++ b/series.conf
@@ -17872,6 +17872,7 @@
patches.fixes/smb3-fill-in-statfs-fsid-and-correct-namelen.patch
patches.fixes/cifs-add-missing-debug-entries-for-kconfig-options.patch
patches.fixes/smb3-simplify-code-by-removing-CONFIG_CIFS_SMB311.patch
+ patches.fixes/smb3-remove-noisy-warning-message-on-mount.patch
patches.fixes/smb3-don-t-request-leases-in-symlink-creation-and-qu.patch
patches.fixes/smb3-fix-reset-of-bytes-read-and-written-stats.patch
patches.fixes/smb3-Do-not-send-SMB3-SET_INFO-if-nothing-changed.patch