diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-03 18:49:14 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-03 18:49:14 -0400 |
| commit | 87e8b821ed8db3dab03d96cd542e29666bf210aa (patch) | |
| tree | 0027060473aafbbb125655ba027319c8a1a665fc /fs/btrfs/compression.c | |
| parent | 33cd9dfa3a13e3d8e41aef225a9f98169816723b (diff) | |
| parent | 5e11611a5d22252f3f9c169a3c9377eac0c32033 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'fs/btrfs/compression.c')
| -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 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, | |||
| 478 | goto next; | 478 | goto next; |
| 479 | } | 479 | } |
| 480 | 480 | ||
| 481 | page = alloc_page(mapping_gfp_mask(mapping) | GFP_NOFS); | 481 | page = alloc_page(mapping_gfp_mask(mapping) & ~__GFP_FS); |
| 482 | if (!page) | 482 | if (!page) |
| 483 | break; | 483 | break; |
| 484 | 484 | ||