]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Btrfs: fix gfp flags masking in the compression code
authorNick Piggin <npiggin@suse.de>
Mon, 15 Mar 2010 15:05:29 +0000 (11:05 -0400)
committerChris Mason <chris.mason@oracle.com>
Mon, 15 Mar 2010 15:05:57 +0000 (11:05 -0400)
GFP_FS must be masked out, NOFS can't be or'd in.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/compression.c

index a11a32058b50a4993f072fd1baddc6e9dafb52a8..28b92a7218ab4cea7c59db65912c071f13b3697b 100644 (file)
@@ -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;