aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/block/drbd/drbd_int.h2
-rw-r--r--drivers/block/drbd/drbd_receiver.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 3b378124bac8..557dd5a2c0cc 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -2497,7 +2497,7 @@ static inline void drbd_md_flush(struct drbd_conf *mdev)
2497 if (test_bit(MD_NO_FUA, &mdev->flags)) 2497 if (test_bit(MD_NO_FUA, &mdev->flags))
2498 return; 2498 return;
2499 2499
2500 r = blkdev_issue_flush(mdev->ldev->md_bdev, GFP_KERNEL, NULL); 2500 r = blkdev_issue_flush(mdev->ldev->md_bdev, GFP_NOIO, NULL);
2501 if (r) { 2501 if (r) {
2502 set_bit(MD_NO_FUA, &mdev->flags); 2502 set_bit(MD_NO_FUA, &mdev->flags);
2503 dev_err(DEV, "meta data flush failed with status %d, disabling md-flushes\n", r); 2503 dev_err(DEV, "meta data flush failed with status %d, disabling md-flushes\n", r);
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 264ea25a9b06..c44eaa0ee0a9 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -957,7 +957,7 @@ static void drbd_flush(struct drbd_conf *mdev)
957 int rv; 957 int rv;
958 958
959 if (mdev->write_ordering >= WO_bdev_flush && get_ldev(mdev)) { 959 if (mdev->write_ordering >= WO_bdev_flush && get_ldev(mdev)) {
960 rv = blkdev_issue_flush(mdev->ldev->backing_bdev, GFP_KERNEL, 960 rv = blkdev_issue_flush(mdev->ldev->backing_bdev, GFP_NOIO,
961 NULL); 961 NULL);
962 if (rv) { 962 if (rv) {
963 dev_info(DEV, "local disk flush failed with status %d\n", rv); 963 dev_info(DEV, "local disk flush failed with status %d\n", rv);
@@ -2907,7 +2907,7 @@ static int receive_SyncParam(struct drbd_conf *mdev, enum drbd_packets cmd, unsi
2907 2907
2908 fifo_size = (mdev->sync_conf.c_plan_ahead * 10 * SLEEP_TIME) / HZ; 2908 fifo_size = (mdev->sync_conf.c_plan_ahead * 10 * SLEEP_TIME) / HZ;
2909 if (fifo_size != mdev->rs_plan_s.size && fifo_size > 0) { 2909 if (fifo_size != mdev->rs_plan_s.size && fifo_size > 0) {
2910 rs_plan_s = kzalloc(sizeof(int) * fifo_size, GFP_KERNEL); 2910 rs_plan_s = kzalloc(sizeof(int) * fifo_size, GFP_NOIO);
2911 if (!rs_plan_s) { 2911 if (!rs_plan_s) {
2912 dev_err(DEV, "kmalloc of fifo_buffer failed"); 2912 dev_err(DEV, "kmalloc of fifo_buffer failed");
2913 goto disconnect; 2913 goto disconnect;