summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2010-03-15 16:05:29 +0100
committerChris Mason <chris.mason@oracle.com>2010-03-15 16:05:57 +0100
commitef5780c018ed169a77b623f87c4ba52faa8ad0fe (patch)
tree4c93fbaa09ed4b2f4b9713ae462646d149be8550 /fs
parentBtrfs: don't look at bio flags after submit_bio (diff)
downloadlinux-ef5780c018ed169a77b623f87c4ba52faa8ad0fe.tar.xz
linux-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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index a11a32058b50..28b92a7218ab 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;