From af65aa8ea78b296857f257bdc52338d03101813b Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Wed, 31 Dec 2014 13:23:00 +0000 Subject: 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 Signed-off-by: Jens Axboe --- drivers/block/loop.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'drivers/block/loop.c') 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; } -- cgit v1.2.3