From: Nick Piggin <npiggin@suse.de>
Date: Mon, 15 Mar 2010 15:05:29 +0000 (-0400)
Subject: Btrfs: fix gfp flags masking in the compression code
X-Git-Tag: v3.0~4995^2~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef5780c018ed169a77b623f87c4ba52faa8ad0fe;p=platform%2Fkernel%2Flinux-amlogic.git

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 @@ 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;