From 5715082da2e500c78bc8a7b61d39844963999071 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] --- yaml --- r: 201720 b: refs/heads/master c:
 0ccd48025fe64cf01782ba3c7037654d25bd1950 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/cifs/inode.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 142905f2d584..cecd7bf2360d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0e6f44e6cc3c7059e8717c452f0999aba507a38
+refs/heads/master: 0ccd48025fe64cf01782ba3c7037654d25bd1950
diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c
index 5a68b92a0f9a..2d9cd2f269eb 100644
--- a/trunk/fs/cifs/inode.c
+++ b/trunk/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");