Commit 51acd208 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French

cifs: remove ctx argument from cifs_setup_cifs_sb

Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 531f03bc
...@@ -810,7 +810,7 @@ cifs_smb3_do_mount(struct file_system_type *fs_type, ...@@ -810,7 +810,7 @@ cifs_smb3_do_mount(struct file_system_type *fs_type,
goto out; goto out;
} }
rc = cifs_setup_cifs_sb(cifs_sb->ctx, cifs_sb); rc = cifs_setup_cifs_sb(cifs_sb);
if (rc) { if (rc) {
root = ERR_PTR(rc); root = ERR_PTR(rc);
goto out; goto out;
......
...@@ -234,8 +234,7 @@ extern int cifs_read_page_from_socket(struct TCP_Server_Info *server, ...@@ -234,8 +234,7 @@ extern int cifs_read_page_from_socket(struct TCP_Server_Info *server,
struct page *page, struct page *page,
unsigned int page_offset, unsigned int page_offset,
unsigned int to_read); unsigned int to_read);
extern int cifs_setup_cifs_sb(struct smb3_fs_context *ctx, extern int cifs_setup_cifs_sb(struct cifs_sb_info *cifs_sb);
struct cifs_sb_info *cifs_sb);
extern int cifs_match_super(struct super_block *, void *); 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 int cifs_mount(struct cifs_sb_info *cifs_sb, struct smb3_fs_context *ctx);
extern void cifs_umount(struct cifs_sb_info *); extern void cifs_umount(struct cifs_sb_info *);
......
...@@ -2701,16 +2701,17 @@ void reset_cifs_unix_caps(unsigned int xid, struct cifs_tcon *tcon, ...@@ -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, int cifs_setup_cifs_sb(struct cifs_sb_info *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); INIT_DELAYED_WORK(&cifs_sb->prune_tlinks, cifs_prune_tlinks);
spin_lock_init(&cifs_sb->tlink_tree_lock); spin_lock_init(&cifs_sb->tlink_tree_lock);
cifs_sb->tlink_tree = RB_ROOT; cifs_sb->tlink_tree = RB_ROOT;
cifs_dbg(FYI, "file mode: %04ho dir mode: %04ho\n", 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 */ /* this is needed for ASCII cp to Unicode converts */
if (ctx->iocharset == NULL) { if (ctx->iocharset == NULL) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment