lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 154/172] cifs: fix reconnect on smb3 mount types
    Date
    From: Paulo Alcantara <pc@cjr.nz>

    commit c36ee7dab7749f7be21f7a72392744490b2a9a2b upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/cifs/cifsfs.c | 2 +-
    fs/cifs/cifsfs.h | 2 +-
    fs/cifs/misc.c | 27 ++++++++++++++++-----------
    3 files changed, 18 insertions(+), 13 deletions(-)

    --- a/fs/cifs/cifsfs.c
    +++ b/fs/cifs/cifsfs.c
    @@ -1033,7 +1033,7 @@ struct file_system_type cifs_fs_type = {
    };
    MODULE_ALIAS_FS("cifs");

    -static struct file_system_type smb3_fs_type = {
    +struct file_system_type smb3_fs_type = {
    .owner = THIS_MODULE,
    .name = "smb3",
    .mount = smb3_do_mount,
    --- a/fs/cifs/cifsfs.h
    +++ b/fs/cifs/cifsfs.h
    @@ -51,7 +51,7 @@ static inline unsigned long cifs_get_tim
    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_smallbuf;

    --- a/fs/cifs/misc.c
    +++ b/fs/cifs/misc.c
    @@ -1053,18 +1053,23 @@ static struct super_block *__cifs_get_su
    .data = data,
    .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);
    -
    - if (!sd.sb)
    - return ERR_PTR(-EINVAL);
    - /*
    - * Grab an active reference in order to prevent automounts (DFS links)
    - * of expiring and then freeing up our cifs superblock pointer while
    - * we're doing failover.
    - */
    - cifs_sb_active(sd.sb);
    - return sd.sb;
    + for (; *fs_type; fs_type++) {
    + iterate_supers_type(*fs_type, f, &sd);
    + if (sd.sb) {
    + /*
    + * Grab an active reference in order to prevent automounts (DFS links)
    + * of expiring and then freeing up our cifs superblock pointer while
    + * we're doing failover.
    + */
    + cifs_sb_active(sd.sb);
    + return sd.sb;
    + }
    + }
    + return ERR_PTR(-EINVAL);
    }

    static void __cifs_put_super(struct super_block *sb)

    \
     
     \ /
      Last update: 2022-06-13 14:49    [W:4.362 / U:1.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site