cifs: add cifs_sb_master_tcon and convert some callers to use it

At mount time, we'll always need to create a tcon that will serve as a
template for others that are associated with the mount. This tcon is
known as the "master" tcon.

In some cases, we'll need to use that tcon regardless of who's accessing
the mount. Add an accessor function for the master tcon and go ahead and
switch the appropriate places to use it.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/cifs/fscache.c b/fs/cifs/fscache.c
index ec4318b019cc..a2ad94efcfe6 100644
--- a/fs/cifs/fscache.c
+++ b/fs/cifs/fscache.c
@@ -62,15 +62,15 @@ static void cifs_fscache_enable_inode_cookie(struct inode *inode)
 {
         struct cifsInodeInfo *cifsi = CIFS_I(inode);
         struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
+        struct cifsTconInfo *tcon = cifs_sb_master_tcon(cifs_sb);
 
         if (cifsi->fscache)
                 return;
 
-        cifsi->fscache = fscache_acquire_cookie(cifs_sb_tcon(cifs_sb)->fscache,
-                                &cifs_fscache_inode_object_def,
-                                cifsi);
-        cFYI(1, "CIFS: got FH cookie (0x%p/0x%p)",
-                        cifs_sb_tcon(cifs_sb)->fscache, cifsi->fscache);
+        cifsi->fscache = fscache_acquire_cookie(tcon->fscache,
+                                &cifs_fscache_inode_object_def, cifsi);
+        cFYI(1, "CIFS: got FH cookie (0x%p/0x%p)", tcon->fscache,
+                                cifsi->fscache);
 }
 
 void cifs_fscache_release_inode_cookie(struct inode *inode)
@@ -118,7 +118,7 @@ void cifs_fscache_reset_inode_cookie(struct inode *inode)
                 fscache_relinquish_cookie(cifsi->fscache, 1);
 
                 cifsi->fscache = fscache_acquire_cookie(
-                                        cifs_sb_tcon(cifs_sb)->fscache,
+                                        cifs_sb_master_tcon(cifs_sb)->fscache,
                                         &cifs_fscache_inode_object_def,
                                         cifsi);
                 cFYI(1, "CIFS: new cookie 0x%p oldcookie 0x%p",