diff options
author | Jens Axboe <jaxboe@fusionio.com> | 2011-06-30 12:10:50 +0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2011-06-30 12:10:50 +0400 |
commit | 7b28afe01ab6ffb5f152f47831b44933facd2328 (patch) | |
tree | a537d78f49fa1b959c9a453f459c1acd767a939f /drivers/block/drbd/drbd_actlog.c | |
parent | 726e99ab88db059fe1422e15376ae404f8c66eb4 (diff) | |
parent | 86e1e98e5c6b4edab97e2b058466ef553cfd878e (diff) | |
download | linux-7b28afe01ab6ffb5f152f47831b44933facd2328.tar.xz |
Merge branch 'for-3.0-important' of git://git.drbd.org/linux-2.6-drbd into for-linus
Diffstat (limited to 'drivers/block/drbd/drbd_actlog.c')
-rw-r--r-- | drivers/block/drbd/drbd_actlog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_actlog.c b/drivers/block/drbd/drbd_actlog.c index 09ef9a878ef0..cf0e63dd97da 100644 --- a/drivers/block/drbd/drbd_actlog.c +++ b/drivers/block/drbd/drbd_actlog.c @@ -79,7 +79,7 @@ static int _drbd_md_sync_page_io(struct drbd_conf *mdev, md_io.error = 0; if ((rw & WRITE) && !test_bit(MD_NO_FUA, &mdev->flags)) - rw |= REQ_FUA; + rw |= REQ_FUA | REQ_FLUSH; rw |= REQ_SYNC; bio = bio_alloc(GFP_NOIO, 1); |