From 0ccd48025fe64cf01782ba3c7037654d25bd1950 Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Fri, 16 Jul 2010 04:31:02 +0000
Subject: [PATCH] [CIFS] Missing ifdef
Signed-off-by: Steve French <sfrench@us.ibm.com>
---
fs/cifs/inode.c | 4 ++++
1 file changed, 4 insertions(+)
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 @@ cifs_iget(struct super_block *sb, struct cifs_fattr *fattr)
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");
--
GitLab