diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
| commit | 91c030b4d6445ebe9fbddb86d584441f300df15c (patch) | |
| tree | e8a48e3ad9e0448c690268175e555fa651983546 /fs/btrfs/compression.c | |
| parent | 7c3456fdb503071787f7f972de1069b9cacd16f0 (diff) | |
| parent | ae6be51ed01d6c4aaf249a207b4434bc7785853b (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 | ||