iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cifs: fix reconnect on smb3 mount types

Browse Source 
cifs.ko defines two file system types: cifs & smb3, and
__cifs_get_super() was not including smb3 file system type when
looking up superblocks, therefore failing to reconnect tcons in
cifs_tree_connect().

Fix this by calling iterate_supers_type() on both file system types.

Link: https://lore.kernel.org/r/CAFrh3J9soC36+BVuwHB=g9z_KB5Og2+p2_W+BBoBOZveErz14w@mail.gmail.com
Cc: stable@vger.kernel.org
Tested-by: Satadru Pramanik <satadru@gmail.com>
Reported-by: Satadru Pramanik <satadru@gmail.com>
Signed-off-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
Paulo Alcantara 2022-06-05 19:54:26 -03:00 committed by Steve French
parent f2906aa863
commit c36ee7dab7
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/cifs/cifsfs.c
View File

@ -1086,7 +1086,7 @@ struct file_system_type cifs_fs_type = {
}; };
MODULE_ALIAS_FS("cifs"); MODULE_ALIAS_FS("cifs");
static struct file_system_type smb3_fs_type = { struct file_system_type smb3_fs_type = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "smb3", .name = "smb3",
.init_fs_context = smb3_init_fs_context, .init_fs_context = smb3_init_fs_context,

2
fs/cifs/cifsfs.h
View File

@ -38,7 +38,7 @@ static inline unsigned long cifs_get_time(struct dentry *dentry)
return (unsigned long) dentry->d_fsdata; return (unsigned long) dentry->d_fsdata;
} }
extern struct file_system_type cifs_fs_type; extern struct file_system_type cifs_fs_type, smb3_fs_type;
extern const struct address_space_operations cifs_addr_ops; extern const struct address_space_operations cifs_addr_ops;
extern const struct address_space_operations cifs_addr_ops_smallbuf; extern const struct address_space_operations cifs_addr_ops_smallbuf;

27
fs/cifs/misc.c
View File

@ -1211,18 +1211,23 @@ static struct super_block *__cifs_get_super(void (*f)(struct super_block *, void
.data = data, .data = data,
.sb = NULL, .sb = NULL,
}; };
struct file_system_type **fs_type = (struct file_system_type *[]) {
&cifs_fs_type, &smb3_fs_type, NULL,
};
iterate_supers_type(&cifs_fs_type, f, &sd); for (; *fs_type; fs_type++) {
iterate_supers_type(*fs_type, f, &sd);
if (!sd.sb) if (sd.sb) {
return ERR_PTR(-EINVAL); /*
/* * Grab an active reference in order to prevent automounts (DFS links)
* Grab an active reference in order to prevent automounts (DFS links) * of expiring and then freeing up our cifs superblock pointer while
* of expiring and then freeing up our cifs superblock pointer while * we're doing failover.
* we're doing failover. */
*/ cifs_sb_active(sd.sb);
cifs_sb_active(sd.sb); return sd.sb;
return sd.sb; }
}
return ERR_PTR(-EINVAL);
} }
static void __cifs_put_super(struct super_block *sb) static void __cifs_put_super(struct super_block *sb)