Commit f6acb9d0 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French

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

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent a6e8a845
......@@ -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;
......
......@@ -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)
......
......@@ -2727,7 +2727,7 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
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;
......
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