Btrfs: fix wrong mapping flags for free space inode

fdmanana · masoncl · commit 1d3c61c2eb3f · 2015-05-06T17:06:13.000-07:00
We were passing a flags value that differed from the intention in commit 2b10826 ("Btrfs: don't use highmem for free space cache pages"). This caused problems in a ARM machine, leaving btrfs unusable there. Reported-by: Merlijn Wajer <merlijn@wizzup.org> Tested-by: Merlijn Wajer <merlijn@wizzup.org> Signed-off-by: Filipe Manana <fdmanana@suse.com> Signed-off-by: Chris Mason <clm@fb.com>
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
@@ -86,7 +86,7 @@ static struct inode *__lookup_free_space_inode(struct btrfs_root *root,
 
 	mapping_set_gfp_mask(inode->i_mapping,
 			mapping_gfp_mask(inode->i_mapping) &
-			~(GFP_NOFS & ~__GFP_HIGHMEM));
+			~(__GFP_FS | __GFP_HIGHMEM));
 
 	return inode;
 }

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ static struct inode __lookup_free_space_inode(struct btrfs_root root,`
`86`	`86`
`87`	`87`	`mapping_set_gfp_mask(inode->i_mapping,`
`88`	`88`	`mapping_gfp_mask(inode->i_mapping) &`
`89`		`- ~(GFP_NOFS & ~__GFP_HIGHMEM));`
	`89`	`+ ~(__GFP_FS \| __GFP_HIGHMEM));`
`90`	`90`
`91`	`91`	`return inode;`
`92`	`92`	`}`