Browse Source

btrfs: clear __GFP_FS flag in the space cache inode

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 <miaox@cn.fujitsu.com>
Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Miao Xie 14 years ago
parent
commit
adae52b94e
2 changed files with 2 additions and 2 deletions
  1. 2 0
      fs/btrfs/free-space-cache.c
  2. 0 2
      fs/btrfs/inode.c

+ 2 - 0
fs/btrfs/free-space-cache.c

@@ -81,6 +81,8 @@ struct inode *lookup_free_space_inode(struct btrfs_root *root,
 		return ERR_PTR(-ENOENT);
 		return ERR_PTR(-ENOENT);
 	}
 	}
 
 
+	inode->i_mapping->flags &= ~__GFP_FS;
+
 	spin_lock(&block_group->lock);
 	spin_lock(&block_group->lock);
 	if (!root->fs_info->closing) {
 	if (!root->fs_info->closing) {
 		block_group->inode = igrab(inode);
 		block_group->inode = igrab(inode);

+ 0 - 2
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);
 	BTRFS_I(inode)->flags = btrfs_inode_flags(leaf, inode_item);
 
 
 	alloc_group_block = btrfs_inode_block_group(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
 	 * try to precache a NULL acl entry for files that don't have