cifs: remove ctx argument from cifs_setup_cifs_sb

Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 229e5cb..4c385ee 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -810,7 +810,7 @@ cifs_smb3_do_mount(struct file_system_type *fs_type,
                goto out;
        }
 
-       rc = cifs_setup_cifs_sb(cifs_sb->ctx, cifs_sb);
+       rc = cifs_setup_cifs_sb(cifs_sb);
        if (rc) {
                root = ERR_PTR(rc);
                goto out;

diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 313d252..bd1c9b0 100644 (file)
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -234,8 +234,7 @@ extern int cifs_read_page_from_socket(struct TCP_Server_Info *server,
                                        struct page *page,
                                        unsigned int page_offset,
                                        unsigned int to_read);
-extern int cifs_setup_cifs_sb(struct smb3_fs_context *ctx,
-                              struct cifs_sb_info *cifs_sb);
+extern int cifs_setup_cifs_sb(struct cifs_sb_info *cifs_sb);
 extern int cifs_match_super(struct super_block *, void *);
 extern int cifs_mount(struct cifs_sb_info *cifs_sb, struct smb3_fs_context *ctx);
 extern void cifs_umount(struct cifs_sb_info *);

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 5ed7403..e0864ae 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2701,16 +2701,17 @@ void reset_cifs_unix_caps(unsigned int xid, struct cifs_tcon *tcon,
        }
 }
 
-int cifs_setup_cifs_sb(struct smb3_fs_context *ctx,
-                       struct cifs_sb_info *cifs_sb)
+int cifs_setup_cifs_sb(struct cifs_sb_info *cifs_sb)
 {
+       struct smb3_fs_context *ctx = cifs_sb->ctx;
+
        INIT_DELAYED_WORK(&cifs_sb->prune_tlinks, cifs_prune_tlinks);
 
        spin_lock_init(&cifs_sb->tlink_tree_lock);
        cifs_sb->tlink_tree = RB_ROOT;
 
        cifs_dbg(FYI, "file mode: %04ho  dir mode: %04ho\n",
-                cifs_sb->ctx->file_mode, cifs_sb->ctx->dir_mode);
+                ctx->file_mode, ctx->dir_mode);
 
        /* this is needed for ASCII cp to Unicode converts */
        if (ctx->iocharset == NULL) {