diff options
| author | Ming Lei <ming.lei@canonical.com> | 2014-12-31 14:23:00 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-01-02 23:07:49 +0100 |
| commit | af65aa8ea78b296857f257bdc52338d03101813b (patch) | |
| tree | 45de5c84ceb1a93c6d3b8057e28206dfc2a67f42 /drivers/block/loop.c | |
| parent | block: loop: introduce lo_discard() and lo_req_flush() (diff) | |
| download | linux-af65aa8ea78b296857f257bdc52338d03101813b.tar.xz linux-af65aa8ea78b296857f257bdc52338d03101813b.zip | |
block: loop: don't handle REQ_FUA explicitly
block core handles REQ_FUA by its flush state machine, so
won't do it in loop explicitly.
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/loop.c')
| -rw-r--r-- | drivers/block/loop.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 018af27256c5..185a86d73c3f 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -459,23 +459,15 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq) pos = ((loff_t) blk_rq_pos(rq) << 9) + lo->lo_offset; if (rq->cmd_flags & REQ_WRITE) { - if (rq->cmd_flags & REQ_FLUSH) ret = lo_req_flush(lo, rq); - - if (rq->cmd_flags & REQ_DISCARD) { + else if (rq->cmd_flags & REQ_DISCARD) ret = lo_discard(lo, rq, pos); - goto out; - } - - ret = lo_send(lo, rq, pos); - - if ((rq->cmd_flags & REQ_FUA) && !ret) - ret = lo_req_flush(lo, rq); + else + ret = lo_send(lo, rq, pos); } else ret = lo_receive(lo, rq, lo->lo_blocksize, pos); -out: return ret; } |