diff options
Diffstat (limited to 'drivers/block/drbd')
-rw-r--r-- | drivers/block/drbd/drbd_int.h | 3 | ||||
-rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index c07c370c4c82..9bdcf4393c0a 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h | |||
@@ -2409,8 +2409,7 @@ static inline void drbd_md_flush(struct drbd_conf *mdev) | |||
2409 | if (test_bit(MD_NO_BARRIER, &mdev->flags)) | 2409 | if (test_bit(MD_NO_BARRIER, &mdev->flags)) |
2410 | return; | 2410 | return; |
2411 | 2411 | ||
2412 | r = blkdev_issue_flush(mdev->ldev->md_bdev, GFP_KERNEL, NULL, | 2412 | r = blkdev_issue_flush(mdev->ldev->md_bdev, GFP_KERNEL, NULL); |
2413 | BLKDEV_IFL_WAIT); | ||
2414 | if (r) { | 2413 | if (r) { |
2415 | set_bit(MD_NO_BARRIER, &mdev->flags); | 2414 | set_bit(MD_NO_BARRIER, &mdev->flags); |
2416 | dev_err(DEV, "meta data flush failed with status %d, disabling md-flushes\n", r); | 2415 | 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 760ae0df9251..efd6169acf2f 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -987,7 +987,7 @@ static enum finish_epoch drbd_flush_after_epoch(struct drbd_conf *mdev, struct d | |||
987 | 987 | ||
988 | if (mdev->write_ordering >= WO_bdev_flush && get_ldev(mdev)) { | 988 | if (mdev->write_ordering >= WO_bdev_flush && get_ldev(mdev)) { |
989 | rv = blkdev_issue_flush(mdev->ldev->backing_bdev, GFP_KERNEL, | 989 | rv = blkdev_issue_flush(mdev->ldev->backing_bdev, GFP_KERNEL, |
990 | NULL, BLKDEV_IFL_WAIT); | 990 | NULL); |
991 | if (rv) { | 991 | if (rv) { |
992 | dev_err(DEV, "local disk flush failed with status %d\n", rv); | 992 | dev_err(DEV, "local disk flush failed with status %d\n", rv); |
993 | /* would rather check on EOPNOTSUPP, but that is not reliable. | 993 | /* would rather check on EOPNOTSUPP, but that is not reliable. |