Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

torvalds · torvalds · commit af6472881a61 · 2015-05-08T20:59:02.000-07:00
Pull btrfs fix from Chris Mason:
 "When an arm user reported crashes near page_address(page) in my new
  code, it became clear that I can't be trusted with GFP masks.  Filipe
  beat me to the patch, and I'll just be in the corner with my dunce cap
  on"

* 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix wrong mapping flags for free space inode
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`	`}`