cifs: temporarily rename cifs_sb->tcon to ptcon to catch stragglers

Signed-off-by: Jeff Layton <jlayton@redhat.com>
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 7fde52969896b23c18fc187f76f038305cb4c27c..ba0afd3acff4ff5f6f7ae675841bd8ee7e77be1a 100644 (file)
--- a/fs/cifs/cifs_fs_sb.h
+++ b/fs/cifs/cifs_fs_sb.h
@@ -39,7 +39,7 @@
 #define CIFS_MOUNT_MF_SYMLINKS 0x10000 /* Minshall+French Symlinks enabled */
 
 struct cifs_sb_info {
-       struct cifsTconInfo *tcon;      /* primary mount */
+       struct cifsTconInfo *ptcon;     /* primary mount */
        struct list_head nested_tcon_q;
        struct nls_table *local_nls;
        unsigned int rsize;

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index c3510168438e2048e281ad3dfd00ddf5b0629130..cc8300c741b6d0e7db398bf89c6afe8c0f2d8185 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -416,7 +416,7 @@ CIFS_SB(struct super_block *sb)
 static inline struct cifsTconInfo *
 cifs_sb_tcon(struct cifs_sb_info *cifs_sb)
 {
-       return cifs_sb->tcon;
+       return cifs_sb->ptcon;
 }
 
 static inline char CIFS_DIR_SEP(const struct cifs_sb_info *cifs_sb)

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index c42d37fb5b7c48a9699123cb6f61f1ca0de6b773..b4bacea54626f9519d2fe5755842bdab60ecbfae 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2727,7 +2727,7 @@ try_mount_again:
                goto remote_path_check;
        }
 
-       cifs_sb->tcon = tcon;
+       cifs_sb->ptcon = tcon;
 
        /* do not care if following two calls succeed - informational */
        if (!tcon->ipc) {
@@ -3029,7 +3029,7 @@ cifs_umount(struct super_block *sb, struct cifs_sb_info *cifs_sb)
        if (cifs_sb_tcon(cifs_sb))
                cifs_put_tcon(cifs_sb_tcon(cifs_sb));
 
-       cifs_sb->tcon = NULL;
+       cifs_sb->ptcon = NULL;
        tmp = cifs_sb->prepath;
        cifs_sb->prepathlen = 0;
        cifs_sb->prepath = NULL;