aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/block/drbd/drbd_int.h2
-rw-r--r--drivers/block/drbd/drbd_worker.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index f223f01b4e1c..4aadd0818179 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -2294,7 +2294,7 @@ static inline void drbd_md_flush(struct drbd_conf *mdev)
2294 if (test_bit(MD_NO_FUA, &mdev->flags)) 2294 if (test_bit(MD_NO_FUA, &mdev->flags))
2295 return; 2295 return;
2296 2296
2297 r = blkdev_issue_flush(mdev->ldev->md_bdev, GFP_KERNEL, NULL); 2297 r = blkdev_issue_flush(mdev->ldev->md_bdev, GFP_NOIO, NULL);
2298 if (r) { 2298 if (r) {
2299 set_bit(MD_NO_FUA, &mdev->flags); 2299 set_bit(MD_NO_FUA, &mdev->flags);
2300 dev_err(DEV, "meta data flush failed with status %d, disabling md-flushes\n", r); 2300 dev_err(DEV, "meta data flush failed with status %d, disabling md-flushes\n", r);
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 377f27bbba17..d348260301f1 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -473,7 +473,7 @@ struct fifo_buffer *fifo_alloc(int fifo_size)
473{ 473{
474 struct fifo_buffer *fb; 474 struct fifo_buffer *fb;
475 475
476 fb = kzalloc(sizeof(struct fifo_buffer) + sizeof(int) * fifo_size, GFP_KERNEL); 476 fb = kzalloc(sizeof(struct fifo_buffer) + sizeof(int) * fifo_size, GFP_NOIO);
477 if (!fb) 477 if (!fb)
478 return NULL; 478 return NULL;
479 479