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>

diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h
index ac51cd2d33aed1a444debff691bfa710e3a5100a..a9d5692e0c2067783a3a0607da7fc7e3cda06c5d 100644 (file)
--- 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;
 };

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index bb39afcc6f3862e71bf1688822684ec40ea4e9ae..2b8e47e5e5339c8fb12291b024e070b21be768c8 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -128,7 +128,6 @@ cifs_read_super(struct super_block *sb, void *data,
        }
        cifs_sb->bdi.ra_pages = default_backing_dev_info.ra_pages;
 
-#ifdef CONFIG_CIFS_DFS_UPCALL
        /*
         * Copy mount params to sb for use in submounts. Better to do
         * the copy here and deal with the error before cleanup gets
@@ -143,9 +142,8 @@ cifs_read_super(struct super_block *sb, void *data,
                        return -ENOMEM;
                }
        }
-#endif
 
-       rc = cifs_mount(sb, cifs_sb, data, devname);
+       rc = cifs_mount(sb, cifs_sb, devname);
 
        if (rc) {
                if (!silent)
@@ -197,12 +195,10 @@ out_no_root:
 
 out_mount_failed:
        if (cifs_sb) {
-#ifdef CONFIG_CIFS_DFS_UPCALL
                if (cifs_sb->mountdata) {
                        kfree(cifs_sb->mountdata);
                        cifs_sb->mountdata = NULL;
                }
-#endif
                unload_nls(cifs_sb->local_nls);
                bdi_destroy(&cifs_sb->bdi);
                kfree(cifs_sb);
@@ -226,12 +222,10 @@ cifs_put_super(struct super_block *sb)
        rc = cifs_umount(sb, cifs_sb);
        if (rc)
                cERROR(1, "cifs_umount failed with return code %d", rc);
-#ifdef CONFIG_CIFS_DFS_UPCALL
        if (cifs_sb->mountdata) {
                kfree(cifs_sb->mountdata);
                cifs_sb->mountdata = NULL;
        }
-#endif
 
        unload_nls(cifs_sb->local_nls);
        bdi_destroy(&cifs_sb->bdi);

diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 136d2f2febcc3d75cc41c2b7bc3a302c27c031f2..a1c94d396afe96936026cf3617a1245db069d8e1 100644 (file)
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -148,7 +148,7 @@ extern struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *, struct inode *,
 extern int set_cifs_acl(struct cifs_ntsd *, __u32, struct inode *,
                                const char *);
 
-extern int cifs_mount(struct super_block *, struct cifs_sb_info *, char *,
+extern int cifs_mount(struct super_block *, struct cifs_sb_info *,
                        const char *);
 extern int cifs_umount(struct super_block *, struct cifs_sb_info *);
 extern void cifs_dfs_release_automount_timer(void);

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 3e20831119a9ef7eef979fac99d32ae4fc21e896..da284e3cb6535e206b9d502e45fdd1c5b9adf5d4 100644 (file)
--- 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;
        }