aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2011-07-11 11:32:26 -0400
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-05-09 09:10:47 -0400
commit22f46ce2ef94151f806f84ab0f9ee43a72dfb1f1 (patch)
treef6d9d6fb9ab824187fbfa48086bee24f42867935 /drivers/block
parentdfa8bedbfe881caf6676704ab1aae18dfe8e430a (diff)
drbd: change some GFP_KERNEL to GFP_NOIO
Bitmap IO may happend in the context of an application write, in the generic block IO path. We need to use GFP_NOIO. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_bitmap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
index e5e756dbc434..9611db43cc7a 100644
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
@@ -955,7 +955,7 @@ static void bm_async_io_complete(struct bio *bio, int error)
955static void bm_page_io_async(struct bm_aio_ctx *ctx, int page_nr, int rw) __must_hold(local) 955static void bm_page_io_async(struct bm_aio_ctx *ctx, int page_nr, int rw) __must_hold(local)
956{ 956{
957 /* we are process context. we always get a bio */ 957 /* we are process context. we always get a bio */
958 struct bio *bio = bio_alloc(GFP_KERNEL, 1); 958 struct bio *bio = bio_alloc(GFP_NOIO, 1);
959 struct drbd_conf *mdev = ctx->mdev; 959 struct drbd_conf *mdev = ctx->mdev;
960 struct drbd_bitmap *b = mdev->bitmap; 960 struct drbd_bitmap *b = mdev->bitmap;
961 struct page *page; 961 struct page *page;
@@ -1029,7 +1029,7 @@ static int bm_rw(struct drbd_conf *mdev, int rw, unsigned lazy_writeout_upper_id
1029 * as we submit copies of pages anyways. 1029 * as we submit copies of pages anyways.
1030 */ 1030 */
1031 1031
1032 ctx = kmalloc(sizeof(struct bm_aio_ctx), GFP_KERNEL); 1032 ctx = kmalloc(sizeof(struct bm_aio_ctx), GFP_NOIO);
1033 if (!ctx) 1033 if (!ctx)
1034 return -ENOMEM; 1034 return -ENOMEM;
1035 1035
@@ -1175,7 +1175,7 @@ int drbd_bm_write_page(struct drbd_conf *mdev, unsigned int idx) __must_hold(loc
1175 return 0; 1175 return 0;
1176 } 1176 }
1177 1177
1178 ctx = kmalloc(sizeof(struct bm_aio_ctx), GFP_KERNEL); 1178 ctx = kmalloc(sizeof(struct bm_aio_ctx), GFP_NOIO);
1179 if (!ctx) 1179 if (!ctx)
1180 return -ENOMEM; 1180 return -ENOMEM;
1181 1181