diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-10-08 05:42:03 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-10-08 05:42:03 +0200 |
| commit | 6ea75952d7c671ea8b0d7b66f82afcafbb5d20c2 (patch) | |
| tree | 66cf5e73830d2730866f7e6bf6cf93f0684c5b99 /fs/cifs/fscache.c | |
| parent | Merge branch 'hwpoison-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | [CIFS] Remove build warning (diff) | |
| download | linux-6ea75952d7c671ea8b0d7b66f82afcafbb5d20c2.tar.xz linux-6ea75952d7c671ea8b0d7b66f82afcafbb5d20c2.zip | |
Merge branch 'for-next'
Diffstat (limited to 'fs/cifs/fscache.c')
| -rw-r--r-- | fs/cifs/fscache.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/fs/cifs/fscache.c b/fs/cifs/fscache.c index 9f3f5c4be161..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->fscache, - &cifs_fscache_inode_object_def, - cifsi); - cFYI(1, "CIFS: got FH cookie (0x%p/0x%p)", - cifs_sb->tcon->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) @@ -117,7 +117,8 @@ void cifs_fscache_reset_inode_cookie(struct inode *inode) /* retire the current fscache cache and get a new one */ fscache_relinquish_cookie(cifsi->fscache, 1); - cifsi->fscache = fscache_acquire_cookie(cifs_sb->tcon->fscache, + cifsi->fscache = fscache_acquire_cookie( + cifs_sb_master_tcon(cifs_sb)->fscache, &cifs_fscache_inode_object_def, cifsi); cFYI(1, "CIFS: new cookie 0x%p oldcookie 0x%p", |