From patchwork Thu Oct 11 02:19:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1580461 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id D94E5DFB34 for ; Thu, 11 Oct 2012 02:19:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964952Ab2JKCTs (ORCPT ); Wed, 10 Oct 2012 22:19:48 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:56796 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964912Ab2JKCTq (ORCPT ); Wed, 10 Oct 2012 22:19:46 -0400 Received: by mail-pb0-f46.google.com with SMTP id rr4so1338767pbb.19 for ; Wed, 10 Oct 2012 19:19:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=U2yVtWsPU9rjbsJPjdeyWJ1aAZn4Qwtf5GAifoon3bg=; b=liuSE6EuM2L4xJNl3ffR9PhpqzoIr6/wcl8YbT4nOzgGyOkHQD1W9tOYQqza9wQ7xW 8kL3jq1eg9YiOARIyLCu5l1/qJ53K3QJGvk0siAna9YJ44rngoWMlYj6/yPpgvuFQ/l/ SpE475ytvBmrQnvV3wVQxhEg2H1huEbCtGy9ojVbD1j+ZUytHdl8PY4X5UTgnIAp44Pp Bg3IpRgWKM0gEh+WNBWHwsSui1CMSWqznWf5MZuD67kr+TL+YJkrZNlqPhXy5W0dVTDR nj/uH85WjDe1JMH+jUan+G4clrnhiVhODZg8s/BlopvYhRYAS24RLFY8kk1+y/5lfKYz dabw== Received: by 10.68.232.163 with SMTP id tp3mr79343829pbc.44.1349921985393; Wed, 10 Oct 2012 19:19:45 -0700 (PDT) Received: from ?IPv6:2607:f298:a:607:1059:f4c1:babe:9559? ([2607:f298:a:607:1059:f4c1:babe:9559]) by mx.google.com with ESMTPS id j10sm1757853pax.4.2012.10.10.19.19.42 (version=SSLv3 cipher=OTHER); Wed, 10 Oct 2012 19:19:44 -0700 (PDT) Message-ID: <50762CBD.2070402@inktank.com> Date: Wed, 10 Oct 2012 19:19:41 -0700 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120912 Thunderbird/15.0.1 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 1/3] rbd: kill rbd_req_{read,write}() References: <50762C54.40101@inktank.com> In-Reply-To: <50762C54.40101@inktank.com> X-Gm-Message-State: ALoCoQl48casyvuF7cBxrMRYkJhdvHpRB03F0ZBu7jrrQ9BSTMLSGd7CcPmad5qsxgX/soxNF6IZ Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Both rbd_req_read() and rbd_req_write() are simple wrapper routines for rbd_do_op(), and each is only called once. Replace each wrapper call with a direct call to rbd_do_op(), and get rid of the wrapper functions. Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 60 +++++++++++---------------------------------------- 1 file changed, 13 insertions(+), 47 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 8f56d37..cc74b36 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1211,41 +1211,6 @@ done: } /* - * Request async osd write - */ -static int rbd_req_write(struct request *rq, - struct rbd_device *rbd_dev, - struct ceph_snap_context *snapc, - u64 ofs, u64 len, - struct bio *bio, - struct rbd_req_coll *coll, - int coll_index) -{ - return rbd_do_op(rq, rbd_dev, snapc, CEPH_NOSNAP, - CEPH_OSD_OP_WRITE, - CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK, - ofs, len, bio, coll, coll_index); -} - -/* - * Request async osd read - */ -static int rbd_req_read(struct request *rq, - struct rbd_device *rbd_dev, - u64 snapid, - u64 ofs, u64 len, - struct bio *bio, - struct rbd_req_coll *coll, - int coll_index) -{ - return rbd_do_op(rq, rbd_dev, NULL, - snapid, - CEPH_OSD_OP_READ, - CEPH_OSD_FLAG_READ, - ofs, len, bio, coll, coll_index); -} - -/* * Request sync osd read */ static int rbd_req_sync_read(struct rbd_device *rbd_dev, @@ -1550,21 +1515,22 @@ static void rbd_rq_fn(struct request_queue *q) goto next_seg; } - /* init OSD command: write or read */ if (do_write) - rbd_req_write(rq, rbd_dev, - snapc, - ofs, - op_size, bio, - coll, cur_seg); + (void) rbd_do_op(rq, rbd_dev, + snapc, CEPH_NOSNAP, + CEPH_OSD_OP_WRITE, + CEPH_OSD_FLAG_WRITE | + CEPH_OSD_FLAG_ONDISK, + ofs, op_size, bio, + coll, cur_seg); else - rbd_req_read(rq, rbd_dev, - rbd_dev->mapping.snap_id, - ofs, - op_size, bio, - coll, cur_seg); - + (void) rbd_do_op(rq, rbd_dev, + NULL, rbd_dev->mapping.snap_id, + CEPH_OSD_OP_READ, + CEPH_OSD_FLAG_READ, + ofs, op_size, bio, + coll, cur_seg); next_seg: size -= op_size; ofs += op_size;