diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cachefiles/internal.h | 2 | ||||
-rw-r--r-- | fs/direct-io.c | 2 | ||||
-rw-r--r-- | fs/nilfs2/mdt.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h index aecd0859eacb..9c4b737a54df 100644 --- a/fs/cachefiles/internal.h +++ b/fs/cachefiles/internal.h | |||
@@ -30,7 +30,7 @@ extern unsigned cachefiles_debug; | |||
30 | #define CACHEFILES_DEBUG_KLEAVE 2 | 30 | #define CACHEFILES_DEBUG_KLEAVE 2 |
31 | #define CACHEFILES_DEBUG_KDEBUG 4 | 31 | #define CACHEFILES_DEBUG_KDEBUG 4 |
32 | 32 | ||
33 | #define cachefiles_gfp (__GFP_WAIT | __GFP_NORETRY | __GFP_NOMEMALLOC) | 33 | #define cachefiles_gfp (__GFP_RECLAIM | __GFP_NORETRY | __GFP_NOMEMALLOC) |
34 | 34 | ||
35 | /* | 35 | /* |
36 | * node records | 36 | * node records |
diff --git a/fs/direct-io.c b/fs/direct-io.c index 3ae0e0427191..18e7554cf94c 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c | |||
@@ -361,7 +361,7 @@ dio_bio_alloc(struct dio *dio, struct dio_submit *sdio, | |||
361 | 361 | ||
362 | /* | 362 | /* |
363 | * bio_alloc() is guaranteed to return a bio when called with | 363 | * bio_alloc() is guaranteed to return a bio when called with |
364 | * __GFP_WAIT and we request a valid number of vectors. | 364 | * __GFP_RECLAIM and we request a valid number of vectors. |
365 | */ | 365 | */ |
366 | bio = bio_alloc(GFP_KERNEL, nr_vecs); | 366 | bio = bio_alloc(GFP_KERNEL, nr_vecs); |
367 | 367 | ||
diff --git a/fs/nilfs2/mdt.h b/fs/nilfs2/mdt.h index fe529a87a208..03246cac3338 100644 --- a/fs/nilfs2/mdt.h +++ b/fs/nilfs2/mdt.h | |||
@@ -72,7 +72,7 @@ static inline struct nilfs_mdt_info *NILFS_MDT(const struct inode *inode) | |||
72 | } | 72 | } |
73 | 73 | ||
74 | /* Default GFP flags using highmem */ | 74 | /* Default GFP flags using highmem */ |
75 | #define NILFS_MDT_GFP (__GFP_WAIT | __GFP_IO | __GFP_HIGHMEM) | 75 | #define NILFS_MDT_GFP (__GFP_RECLAIM | __GFP_IO | __GFP_HIGHMEM) |
76 | 76 | ||
77 | int nilfs_mdt_get_block(struct inode *, unsigned long, int, | 77 | int nilfs_mdt_get_block(struct inode *, unsigned long, int, |
78 | void (*init_block)(struct inode *, | 78 | void (*init_block)(struct inode *, |