From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751797AbbCVIP1 (ORCPT ); Sun, 22 Mar 2015 04:15:27 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:35712 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751712AbbCVIPO (ORCPT ); Sun, 22 Mar 2015 04:15:14 -0400 From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org Cc: Christoph Hellwig , Al Viro , Maxim Patlasov , Ming Lei Subject: [PATCH 2/3] block: loop: unify interface type of lo_send and lo_receive Date: Sun, 22 Mar 2015 16:14:53 +0800 Message-Id: <1427012095-4095-3-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1427012095-4095-1-git-send-email-ming.lei@canonical.com> References: <1427012095-4095-1-git-send-email-ming.lei@canonical.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Preparing for conversion to vfs iterator based read/write, also pass 'loop_cmd' instead of 'request' so that rw common stuff can be put into loop_cmd easily. Signed-off-by: Ming Lei --- drivers/block/loop.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 965f117..c082cf7 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -289,7 +289,7 @@ static int do_lo_send_write(struct loop_device *lo, struct bio_vec *bvec, return ret; } -static int lo_send(struct loop_device *lo, struct request *rq, loff_t pos) +static int lo_send(struct loop_device *lo, struct loop_cmd *cmd, loff_t pos) { int (*do_lo_send)(struct loop_device *, struct bio_vec *, loff_t, struct page *page); @@ -297,6 +297,7 @@ static int lo_send(struct loop_device *lo, struct request *rq, loff_t pos) struct req_iterator iter; struct page *page = NULL; int ret = 0; + struct request *rq = cmd->rq; if (lo->transfer != transfer_none) { page = alloc_page(GFP_NOIO | __GFP_HIGHMEM); @@ -394,11 +395,13 @@ do_lo_receive(struct loop_device *lo, } static int -lo_receive(struct loop_device *lo, struct request *rq, int bsize, loff_t pos) +lo_receive(struct loop_device *lo, struct loop_cmd *cmd, loff_t pos) { struct bio_vec bvec; struct req_iterator iter; ssize_t s; + struct request *rq = cmd->rq; + int bsize = lo->lo_blocksize; rq_for_each_segment(bvec, rq, iter) { s = do_lo_receive(lo, &bvec, bsize, pos); @@ -451,10 +454,24 @@ static int lo_req_flush(struct loop_device *lo, struct request *rq) return ret; } -static int do_req_filebacked(struct loop_device *lo, struct request *rq) +static inline int lo_rw(struct loop_device *lo, struct loop_cmd *cmd, + loff_t pos, int rw) +{ + int ret; + + if (rw == READ) + ret = lo_receive(lo, cmd, pos); + else + ret = lo_send(lo, cmd, pos); + + return ret; +} + +static int do_req_filebacked(struct loop_device *lo, struct loop_cmd *cmd) { loff_t pos; int ret; + struct request *rq = cmd->rq; pos = ((loff_t) blk_rq_pos(rq) << 9) + lo->lo_offset; @@ -464,9 +481,9 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq) else if (rq->cmd_flags & REQ_DISCARD) ret = lo_discard(lo, rq, pos); else - ret = lo_send(lo, rq, pos); + ret = lo_rw(lo, cmd, pos, WRITE); } else - ret = lo_receive(lo, rq, lo->lo_blocksize, pos); + ret = lo_rw(lo, cmd, pos, READ); return ret; } @@ -1514,7 +1531,7 @@ static void loop_handle_cmd(struct loop_cmd *cmd) if (write && (lo->lo_flags & LO_FLAGS_READ_ONLY)) goto failed; - ret = do_req_filebacked(lo, cmd->rq); + ret = do_req_filebacked(lo, cmd); failed: if (ret) -- 1.7.9.5