diff options
| author | Nick Piggin <npiggin@suse.de> | 2010-03-15 11:05:29 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2010-03-15 11:05:57 -0400 |
| commit | ef5780c018ed169a77b623f87c4ba52faa8ad0fe (patch) | |
| tree | 4c93fbaa09ed4b2f4b9713ae462646d149be8550 /fs | |
| parent | 5ff7ba3a797a8ffd5299b8477df2dca3c3ebd34e (diff) | |
| download | linux-3.10-ef5780c018ed169a77b623f87c4ba52faa8ad0fe.tar.gz linux-3.10-ef5780c018ed169a77b623f87c4ba52faa8ad0fe.tar.bz2 linux-3.10-ef5780c018ed169a77b623f87c4ba52faa8ad0fe.zip | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/compression.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index a11a32058b5..28b92a7218a 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -478,7 +478,7 @@ static noinline int add_ra_bio_pages(struct inode *inode, goto next; } - page = alloc_page(mapping_gfp_mask(mapping) | GFP_NOFS); + page = alloc_page(mapping_gfp_mask(mapping) & ~__GFP_FS); if (!page) break; |