Commit af647288 authored May 08, 2015 by Linus Torvalds

linux-btrfs

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

parents 5d5df5ee 1d3c61c2

fs/btrfs/free-space-cache.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -86,7 +86,7 @@ static struct inode __lookup_free_space_inode(struct btrfs_root root,

	mapping_set_gfp_mask(inode->i_mapping,		mapping_set_gfp_mask(inode->i_mapping,
	mapping_gfp_mask(inode->i_mapping) &		mapping_gfp_mask(inode->i_mapping) &
	~(GFP_NOFS & ~__GFP_HIGHMEM));		~(__GFP_FS \| __GFP_HIGHMEM));

	return inode;		return inode;
	}		}