diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2017-06-12 08:30:13 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-06-12 08:30:13 -0600 |
| commit | 8f66439eec46d652255b9351abebb540ee5b2fd9 (patch) | |
| tree | 94f4a41dc343cf769cd92f1f7711e9ce8ad43728 /drivers/md/dm-bufio.c | |
| parent | dm: bump DM_VERSION_MINOR in response to target method error code changes (diff) | |
| parent | Linux 4.12-rc5 (diff) | |
| download | linux-dev-8f66439eec46d652255b9351abebb540ee5b2fd9.tar.xz linux-dev-8f66439eec46d652255b9351abebb540ee5b2fd9.zip | |
Merge tag 'v4.12-rc5' into for-4.13/block
We've already got a few conflicts and upcoming work depends on some of the
changes that have gone into mainline as regression fixes for this series.
Pull in 4.12-rc5 to resolve these conflicts and make it easier on down stream
trees to continue working on 4.13 changes.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/md/dm-bufio.c')
| -rw-r--r-- | drivers/md/dm-bufio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c index 0902d2fd1743..850ff6c67994 100644 --- a/drivers/md/dm-bufio.c +++ b/drivers/md/dm-bufio.c @@ -1336,7 +1336,7 @@ int dm_bufio_issue_flush(struct dm_bufio_client *c) { struct dm_io_request io_req = { .bi_op = REQ_OP_WRITE, - .bi_op_flags = REQ_PREFLUSH, + .bi_op_flags = REQ_PREFLUSH | REQ_SYNC, .mem.type = DM_IO_KMEM, .mem.ptr.addr = NULL, .client = c->dm_io, |