]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
[CIFS] Missing ifdef
authorSteve French <sfrench@us.ibm.com>
Fri, 16 Jul 2010 04:31:02 +0000 (04:31 +0000)
committerSteve French <sfrench@us.ibm.com>
Mon, 2 Aug 2010 12:40:38 +0000 (12:40 +0000)
Signed-off-by: Steve French <sfrench@us.ibm.com>
fs/cifs/inode.c

index 5a68b92a0f9aebfff069109b3846801764298d54..2d9cd2f269eba0383b29fc5c02875b832f5f0563 100644 (file)
@@ -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");