| commit | ef5780c018ed169a77b623f87c4ba52faa8ad0fe | [log] [tgz] |
|---|---|---|
| author | Nick Piggin <npiggin@suse.de> | Mon Mar 15 11:05:29 2010 -0400 |
| committer | Chris Mason <chris.mason@oracle.com> | Mon Mar 15 11:05:57 2010 -0400 |
| tree | 4c93fbaa09ed4b2f4b9713ae462646d149be8550 | |
| parent | 5ff7ba3a797a8ffd5299b8477df2dca3c3ebd34e [diff] |
Btrfs: fix gfp flags masking in the compression code GFP_FS must be masked out, NOFS can't be or'd in. Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index a11a320..28b92a7 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c
@@ -478,7 +478,7 @@ goto next; } - page = alloc_page(mapping_gfp_mask(mapping) | GFP_NOFS); + page = alloc_page(mapping_gfp_mask(mapping) & ~__GFP_FS); if (!page) break;