From: Steve French <sfrench@us.ibm.com>
Date: Fri, 16 Jul 2010 04:31:02 +0000 (+0000)
Subject: [CIFS] Missing ifdef
X-Git-Tag: v2.6.36-rc1~590^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0ccd48025fe64cf01782ba3c7037654d25bd1950;p=platform%2Fkernel%2Flinux-3.10.git

[CIFS] Missing ifdef

Signed-off-by: Steve French <sfrench@us.ibm.com>
---

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 5a68b92..2d9cd2f 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");