summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2010-07-16 04:31:02 +0000
committerSteve French <sfrench@us.ibm.com>2010-08-02 12:40:38 +0000
commit0ccd48025fe64cf01782ba3c7037654d25bd1950 (patch)
treee264b9972c48f90bb247887ab38444be79cd0f73 /fs
parentd0e6f44e6cc3c7059e8717c452f0999aba507a38 (diff)
downloadblackbird-op-linux-0ccd48025fe64cf01782ba3c7037654d25bd1950.tar.gz
blackbird-op-linux-0ccd48025fe64cf01782ba3c7037654d25bd1950.zip
[CIFS] Missing ifdef
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/inode.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 5a68b92a0f9a..2d9cd2f269eb 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -777,8 +777,10 @@ retry_iget5_locked:
inode->i_flags |= S_NOATIME | S_NOCMTIME;
if (inode->i_state & I_NEW) {
inode->i_ino = hash;
+#ifdef CONFIG_CIFS_FSCACHE
/* initialize per-inode cache cookie pointer */
CIFS_I(inode)->fscache = NULL;
+#endif
unlock_new_inode(inode);
}
}
@@ -810,8 +812,10 @@ struct inode *cifs_root_iget(struct super_block *sb, unsigned long ino)
if (!inode)
return ERR_PTR(-ENOMEM);
+#ifdef CONFIG_CIFS_FSCACHE
/* populate tcon->resource_id */
cifs_sb->tcon->resource_id = CIFS_I(inode)->uniqueid;
+#endif
if (rc && cifs_sb->tcon->ipc) {
cFYI(1, "ipc connection - fake read inode");
OpenPOWER on IntegriCloud