From patchwork Thu Nov 8 14:08:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1716061 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 3103FDF280 for ; Thu, 8 Nov 2012 14:08:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755605Ab2KHOIX (ORCPT ); Thu, 8 Nov 2012 09:08:23 -0500 Received: from mail-ie0-f174.google.com ([209.85.223.174]:63741 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752014Ab2KHOIX (ORCPT ); Thu, 8 Nov 2012 09:08:23 -0500 Received: by mail-ie0-f174.google.com with SMTP id k13so4178788iea.19 for ; Thu, 08 Nov 2012 06:08:22 -0800 (PST) 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=1PvExo2C8cBgNhtVxJN/ip2CGQtVxOGY/mGhWsY7a2Q=; b=OtaAF4wX18WFHMjuFmzCQHzRmfgQ091OPfmDnoHgUum0kYSqF4yMzDq7GfWDuQ2B72 OGzbyQy4Umgm6GaXIx+EH3she80u+mzPJzaoMjm/7IaQYPrH3Q+FJ6x2CVm/XvSZb8K6 qNKA0C5QN05TlEc1U1twF1T4bbKRISjH7FsG6O2O5t0f56MxSXnzQOhR5IXPmUK7998Q uJe8mxM+vQVHn3mPNMpAitndo8+x+0Uvb+4rdjiTazZuAeERzQtSVawgxwMfiyqM9nzq HHc/YfsRQjXc3w0xHjacoujPlpVe+ChyaO2e/LCEAOv+INeTDzgzrn0aPPJYk3oNSwsz UIUA== Received: by 10.50.161.130 with SMTP id xs2mr1932470igb.34.1352383702772; Thu, 08 Nov 2012 06:08:22 -0800 (PST) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id dq9sm4748884igc.5.2012.11.08.06.08.21 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 06:08:22 -0800 (PST) Message-ID: <509BBCD7.9070608@inktank.com> Date: Thu, 08 Nov 2012 08:08:23 -0600 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: "ceph-devel@vger.kernel.org" Subject: [PATCH 1/3] rbd: standardize rbd_request variable names References: <509BBC83.1020203@inktank.com> In-Reply-To: <509BBC83.1020203@inktank.com> X-Gm-Message-State: ALoCoQmHAlydsO6gi9FYbquuLiB/3kSumsSBdo9qLSTJvF1yfGoVVhzRIvYk9W2DOcYy9vSH9pUE Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org There are two names used for items of rbd_request structure type: "req" and "req_data". The former name is also used to represent items of pointers to struct ceph_osd_request. Change all variables that have these names so they are instead called "rbd_req" consistently. Signed-off-by: Alex Elder --- drivers/block/rbd.c | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) /* @@ -1121,12 +1123,12 @@ static int rbd_do_request(struct request *rq, int ret; u64 bno; struct timespec mtime = CURRENT_TIME; - struct rbd_request *req_data; + struct rbd_request *rbd_req; struct ceph_osd_request_head *reqhead; struct ceph_osd_client *osdc; - req_data = kzalloc(sizeof(*req_data), GFP_NOIO); - if (!req_data) { + rbd_req = kzalloc(sizeof(*rbd_req), GFP_NOIO); + if (!rbd_req) { if (coll) rbd_coll_end_req_index(rq, coll, coll_index, -ENOMEM, len); @@ -1134,8 +1136,8 @@ static int rbd_do_request(struct request *rq, } if (coll) { - req_data->coll = coll; - req_data->coll_index = coll_index; + rbd_req->coll = coll; + rbd_req->coll_index = coll_index; } dout("rbd_do_request object_name=%s ofs=%llu len=%llu coll=%p[%d]\n", @@ -1152,12 +1154,12 @@ static int rbd_do_request(struct request *rq, req->r_callback = rbd_cb; - req_data->rq = rq; - req_data->bio = bio; - req_data->pages = pages; - req_data->len = len; + rbd_req->rq = rq; + rbd_req->bio = bio; + rbd_req->pages = pages; + rbd_req->len = len; - req->r_priv = req_data; + req->r_priv = rbd_req; reqhead = req->r_request->front.iov_base; reqhead->snapid = cpu_to_le64(CEPH_NOSNAP); @@ -1202,11 +1204,11 @@ static int rbd_do_request(struct request *rq, return ret; done_err: - bio_chain_put(req_data->bio); + bio_chain_put(rbd_req->bio); ceph_osdc_put_request(req); done_pages: - rbd_coll_end_req(req_data, ret, len); - kfree(req_data); + rbd_coll_end_req(rbd_req, ret, len); + kfree(rbd_req); return ret; } @@ -1215,7 +1217,7 @@ done_pages: */ static void rbd_req_cb(struct ceph_osd_request *req, struct ceph_msg *msg) { - struct rbd_request *req_data = req->r_priv; + struct rbd_request *rbd_req = req->r_priv; struct ceph_osd_reply_head *replyhead; struct ceph_osd_op *op; __s32 rc; @@ -1234,20 +1236,20 @@ static void rbd_req_cb(struct ceph_osd_request *req, struct ceph_msg *msg) (unsigned long long) bytes, read_op, (int) rc); if (rc == -ENOENT && read_op) { - zero_bio_chain(req_data->bio, 0); + zero_bio_chain(rbd_req->bio, 0); rc = 0; - } else if (rc == 0 && read_op && bytes < req_data->len) { - zero_bio_chain(req_data->bio, bytes); - bytes = req_data->len; + } else if (rc == 0 && read_op && bytes < rbd_req->len) { + zero_bio_chain(rbd_req->bio, bytes); + bytes = rbd_req->len; } - rbd_coll_end_req(req_data, rc, bytes); + rbd_coll_end_req(rbd_req, rc, bytes); - if (req_data->bio) - bio_chain_put(req_data->bio); + if (rbd_req->bio) + bio_chain_put(rbd_req->bio); ceph_osdc_put_request(req); - kfree(req_data); + kfree(rbd_req); } static void rbd_simple_req_cb(struct ceph_osd_request *req, struct ceph_msg *msg) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 5de49a1..9d8b406 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1090,10 +1090,12 @@ static void rbd_coll_end_req_index(struct request *rq, spin_unlock_irq(q->queue_lock); } -static void rbd_coll_end_req(struct rbd_request *req, +static void rbd_coll_end_req(struct rbd_request *rbd_req, int ret, u64 len) { - rbd_coll_end_req_index(req->rq, req->coll, req->coll_index, ret, len); + rbd_coll_end_req_index(rbd_req->rq, + rbd_req->coll, rbd_req->coll_index, + ret, len); }