diff options
-rw-r--r-- | drivers/md/dm-crypt.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index db6b51639cee..6c83ad901770 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c | |||
@@ -176,7 +176,6 @@ struct crypt_config { | |||
176 | 176 | ||
177 | #define MIN_IOS 16 | 177 | #define MIN_IOS 16 |
178 | #define MIN_POOL_PAGES 32 | 178 | #define MIN_POOL_PAGES 32 |
179 | #define MIN_BIO_PAGES 8 | ||
180 | 179 | ||
181 | static struct kmem_cache *_crypt_io_pool; | 180 | static struct kmem_cache *_crypt_io_pool; |
182 | 181 | ||
@@ -848,12 +847,11 @@ static struct bio *crypt_alloc_buffer(struct dm_crypt_io *io, unsigned size, | |||
848 | } | 847 | } |
849 | 848 | ||
850 | /* | 849 | /* |
851 | * if additional pages cannot be allocated without waiting, | 850 | * If additional pages cannot be allocated without waiting, |
852 | * return a partially allocated bio, the caller will then try | 851 | * return a partially-allocated bio. The caller will then try |
853 | * to allocate additional bios while submitting this partial bio | 852 | * to allocate more bios while submitting this partial bio. |
854 | */ | 853 | */ |
855 | if (i == (MIN_BIO_PAGES - 1)) | 854 | gfp_mask = (gfp_mask | __GFP_NOWARN) & ~__GFP_WAIT; |
856 | gfp_mask = (gfp_mask | __GFP_NOWARN) & ~__GFP_WAIT; | ||
857 | 855 | ||
858 | len = (size > PAGE_SIZE) ? PAGE_SIZE : size; | 856 | len = (size > PAGE_SIZE) ? PAGE_SIZE : size; |
859 | 857 | ||