btrfs: clear __GFP_FS flag in the space cache inode

Miao Xie · chrismason-xx · commit adae52b94e18 · 2011-04-05T01:19:43.000-04:00
the object id of the space cache inode's key is allocated from the relative
root, just like the regular file. So we can't identify space cache inode by
checking the object id of the inode's key, and we have to clear __GFP_FS flag
at the time we look up the space cache inode.

Signed-off-by: Miao Xie &lt;miaox@cn.fujitsu.com&gt;
Signed-off-by: Liu Bo &lt;liubo2009@cn.fujitsu.com&gt;
Signed-off-by: Chris Mason &lt;chris.mason@oracle.com&gt;
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
@@ -81,6 +81,8 @@ struct inode *lookup_free_space_inode(struct btrfs_root *root,
 		return ERR_PTR(-ENOENT);
 	}
 
+	inode->i_mapping->flags &= ~__GFP_FS;
+
 	spin_lock(&block_group->lock);
 	if (!root->fs_info->closing) {
 		block_group->inode = igrab(inode);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
@@ -2535,8 +2535,6 @@ static void btrfs_read_locked_inode(struct inode *inode)
 	BTRFS_I(inode)->flags = btrfs_inode_flags(leaf, inode_item);
 
 	alloc_group_block = btrfs_inode_block_group(leaf, inode_item);
-	if (location.objectid == BTRFS_FREE_SPACE_OBJECTID)
-		inode->i_mapping->flags &= ~__GFP_FS;
 
 	/*
 	 * try to precache a NULL acl entry for files that don't have

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,8 @@ struct inode lookup_free_space_inode(struct btrfs_root root,`
`81`	`81`	`return ERR_PTR(-ENOENT);`
`82`	`82`	`}`
`83`	`83`
	`84`	`+ inode->i_mapping->flags &= ~__GFP_FS;`
	`85`	`+`
`84`	`86`	`spin_lock(&block_group->lock);`
`85`	`87`	`if (!root->fs_info->closing) {`
`86`	`88`	`block_group->inode = igrab(inode);`