summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2010-09-20 16:01:34 -0700
committerSteve French <sfrench@us.ibm.com>2010-09-29 19:04:33 +0000
commitf6acb9d0596889a774e142ed76cb05b90d9763d2 (patch)
treea6d74c288f9941bf011a68df4d1729048fd779af
parenta6e8a8455c94565c53e1a1756d2ab9d9e3a902b8 (diff)
downloadlinux-3.10-f6acb9d0596889a774e142ed76cb05b90d9763d2.tar.gz
linux-3.10-f6acb9d0596889a774e142ed76cb05b90d9763d2.tar.bz2
linux-3.10-f6acb9d0596889a774e142ed76cb05b90d9763d2.zip
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>
-rw-r--r--fs/cifs/cifs_fs_sb.h2
-rw-r--r--fs/cifs/cifsglob.h2
-rw-r--r--fs/cifs/connect.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h
index 7fde5296989..ba0afd3acff 100644
--- 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 c3510168438..cc8300c741b 100644
--- 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 c42d37fb5b7..b4bacea5462 100644
--- 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;