aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/cifs')
-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 7fde52969896..ba0afd3acff4 100644
--- a/fs/cifs/cifs_fs_sb.h
+++ b/fs/cifs/cifs_fs_sb.h
@@ -39,7 +39,7 @@
39#define CIFS_MOUNT_MF_SYMLINKS 0x10000 /* Minshall+French Symlinks enabled */ 39#define CIFS_MOUNT_MF_SYMLINKS 0x10000 /* Minshall+French Symlinks enabled */
40 40
41struct cifs_sb_info { 41struct cifs_sb_info {
42 struct cifsTconInfo *tcon; /* primary mount */ 42 struct cifsTconInfo *ptcon; /* primary mount */
43 struct list_head nested_tcon_q; 43 struct list_head nested_tcon_q;
44 struct nls_table *local_nls; 44 struct nls_table *local_nls;
45 unsigned int rsize; 45 unsigned int rsize;
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index c3510168438e..cc8300c741b6 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -416,7 +416,7 @@ CIFS_SB(struct super_block *sb)
416static inline struct cifsTconInfo * 416static inline struct cifsTconInfo *
417cifs_sb_tcon(struct cifs_sb_info *cifs_sb) 417cifs_sb_tcon(struct cifs_sb_info *cifs_sb)
418{ 418{
419 return cifs_sb->tcon; 419 return cifs_sb->ptcon;
420} 420}
421 421
422static inline char CIFS_DIR_SEP(const struct cifs_sb_info *cifs_sb) 422static 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 c42d37fb5b7c..b4bacea54626 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2727,7 +2727,7 @@ try_mount_again:
2727 goto remote_path_check; 2727 goto remote_path_check;
2728 } 2728 }
2729 2729
2730 cifs_sb->tcon = tcon; 2730 cifs_sb->ptcon = tcon;
2731 2731
2732 /* do not care if following two calls succeed - informational */ 2732 /* do not care if following two calls succeed - informational */
2733 if (!tcon->ipc) { 2733 if (!tcon->ipc) {
@@ -3029,7 +3029,7 @@ cifs_umount(struct super_block *sb, struct cifs_sb_info *cifs_sb)
3029 if (cifs_sb_tcon(cifs_sb)) 3029 if (cifs_sb_tcon(cifs_sb))
3030 cifs_put_tcon(cifs_sb_tcon(cifs_sb)); 3030 cifs_put_tcon(cifs_sb_tcon(cifs_sb));
3031 3031
3032 cifs_sb->tcon = NULL; 3032 cifs_sb->ptcon = NULL;
3033 tmp = cifs_sb->prepath; 3033 tmp = cifs_sb->prepath;
3034 cifs_sb->prepathlen = 0; 3034 cifs_sb->prepathlen = 0;
3035 cifs_sb->prepath = NULL; 3035 cifs_sb->prepath = NULL;