diff options
| author | Sean Finney <seanius@seanius.net> | 2011-04-11 13:19:35 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-05-19 14:10:55 +0000 |
| commit | f14bcf71d1b802f6042b6c70a0c37120e47a0876 (patch) | |
| tree | 9852d20c31ec19caaccec30a0b06b89542681ac7 /fs/cifs/connect.c | |
| parent | 5167f11ec962690ecf926fab00f1d0524cd78664 (diff) | |
| download | kernel_samsung_smdk4412-f14bcf71d1b802f6042b6c70a0c37120e47a0876.zip kernel_samsung_smdk4412-f14bcf71d1b802f6042b6c70a0c37120e47a0876.tar.gz kernel_samsung_smdk4412-f14bcf71d1b802f6042b6c70a0c37120e47a0876.tar.bz2 | |
cifs: Unconditionally copy mount options to superblock info
Previously mount options were copied and updated in the cifs_sb_info
struct only when CONFIG_CIFS_DFS_UPCALL was enabled. Making this
information generally available allows us to remove a number of ifdefs,
extra function params, and temporary variables.
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Sean Finney <seanius@seanius.net>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 3e20831..da284e3 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -2842,7 +2842,7 @@ expand_dfs_referral(int xid, struct cifsSesInfo *pSesInfo, int cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, - char *mount_data_global, const char *devname) + const char *devname) { int rc; int xid; @@ -2851,13 +2851,10 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, struct cifsTconInfo *tcon; struct TCP_Server_Info *srvTcp; char *full_path; - char *mount_data = mount_data_global; struct tcon_link *tlink; #ifdef CONFIG_CIFS_DFS_UPCALL int referral_walks_count = 0; try_mount_again: - mount_data = cifs_sb->mountdata; - /* cleanup activities if we're chasing a referral */ if (referral_walks_count) { if (tcon) @@ -2884,7 +2881,8 @@ try_mount_again: goto out; } - if (cifs_parse_mount_options(mount_data, devname, volume_info)) { + if (cifs_parse_mount_options(cifs_sb->mountdata, devname, + volume_info)) { rc = -EINVAL; goto out; } |