From: Karel Zak <kzak@redhat.com>
Date: Wed, 11 Mar 2020 17:38:09 +0000 (+0100)
Subject: libmount: smb2 is unsupported alias
X-Git-Tag: v2.36-rc1~180
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36d80cb6c11b3064ed9fb29c7c8b101e3f266441;p=thirdparty%2Futil-linux.git

libmount: smb2 is unsupported alias

Kenneth D'souza wrote:
 # grep -w MODULE_ALIAS_FS fs/cifs/cifsfs.c
 MODULE_ALIAS_FS("cifs");
 112/112│MODULE_ALIAS_FS("smb3");

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1812118
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/src/tab.c b/libmount/src/tab.c
index aeeefcde68..1633d42310 100644
--- a/libmount/src/tab.c
+++ b/libmount/src/tab.c
@@ -1764,7 +1764,6 @@ int __mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_f
 			const char *fstype = mnt_fs_get_fstype(fs);
 
 			if (fstype && (strcmp(fstype, "cifs") == 0
-				       || strcmp(fstype, "smb2") == 0
 				       || strcmp(fstype, "smb3") == 0)) {
 
 				const char *unc_subdir = get_cifs_unc_subdir_path(src);
diff --git a/libmount/src/utils.c b/libmount/src/utils.c
index 90c84f4009..ffbd0c1705 100644
--- a/libmount/src/utils.c
+++ b/libmount/src/utils.c
@@ -332,7 +332,6 @@ int mnt_fstype_is_pseudofs(const char *type)
 int mnt_fstype_is_netfs(const char *type)
 {
 	if (strcmp(type, "cifs")   == 0 ||
-	    strcmp(type, "smb2")   == 0 ||
 	    strcmp(type, "smb3")   == 0 ||
 	    strcmp(type, "smbfs")  == 0 ||
 	    strncmp(type,"nfs", 3) == 0 ||