summaryrefslogtreecommitdiff
path: root/fs/cifs/cifs_fs_sb.h
diff options
context:
space:
mode:
authorSean Finney <seanius@seanius.net>2011-04-11 13:19:35 +0000
committerSteve French <sfrench@us.ibm.com>2011-05-19 14:10:55 +0000
commitf14bcf71d1b802f6042b6c70a0c37120e47a0876 (patch)
tree9852d20c31ec19caaccec30a0b06b89542681ac7 /fs/cifs/cifs_fs_sb.h
parent5167f11ec962690ecf926fab00f1d0524cd78664 (diff)
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/cifs_fs_sb.h')
-rw-r--r--fs/cifs/cifs_fs_sb.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h
index ac51cd2d33ae..a9d5692e0c20 100644
--- a/fs/cifs/cifs_fs_sb.h
+++ b/fs/cifs/cifs_fs_sb.h
@@ -58,9 +58,7 @@ struct cifs_sb_info {
unsigned int mnt_cifs_flags;
int prepathlen;
char *prepath; /* relative path under the share to mount to */
-#ifdef CONFIG_CIFS_DFS_UPCALL
- char *mountdata; /* mount options received at mount time */
-#endif
+ char *mountdata; /* options received at mount time or via DFS refs */
struct backing_dev_info bdi;
struct delayed_work prune_tlinks;
};