From patchwork Thu Nov 8 14:12:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1716121 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 4CD83DF280 for ; Thu, 8 Nov 2012 14:12:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755962Ab2KHOMV (ORCPT ); Thu, 8 Nov 2012 09:12:21 -0500 Received: from mail-ie0-f174.google.com ([209.85.223.174]:57441 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755644Ab2KHOMU (ORCPT ); Thu, 8 Nov 2012 09:12:20 -0500 Received: by mail-ie0-f174.google.com with SMTP id k13so4184469iea.19 for ; Thu, 08 Nov 2012 06:12:20 -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 :content-type:content-transfer-encoding:x-gm-message-state; bh=l38ug7PlUzF9yJb5S895DZeugqE2cttnDPhkrOnjfGM=; b=nLXrxwg+yhvJtbpk750h8CzjHN1b8FGJZEePbvyG+kWQ6S0i7IwT+dlXwOscopRbDc UFyW7CsOuVEETg7aEkRm16NjYM7U55W2Jg8rneOvngRS335/rNkjRNpWNZVRmWbyhEiv Fud3ZNZ5JjlURKKL2rWJ4kezzgfjQseOOtng4QPyGGstbt2brcipBqr6+aRrVjzXDCtc NJlFpa4+ReBJEJcf98NAIAij9yvVtdyZf9+MIp8K9M0WY5jEKo8TDXsShDpNBXVI7Qet nHKo1qruJUp6XZd6vcPYHZ6/iYMs9CVlokOqntoHcSU7yZp7c9p6GcwjEEUeu0izU/qL IZtg== Received: by 10.50.154.227 with SMTP id vr3mr20022307igb.43.1352383940354; Thu, 08 Nov 2012 06:12:20 -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 az6sm4454243igb.11.2012.11.08.06.12.18 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 06:12:19 -0800 (PST) Message-ID: <509BBDC4.1070206@inktank.com> Date: Thu, 08 Nov 2012 08:12:20 -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] rbd: end request on error in rbd_do_request() caller X-Gm-Message-State: ALoCoQmocFeeh/KOu8TqfngvPnj1o2r4MUyj9c5bK7y6yM431eI1ECUjyf6DyMtKUgoPYSkjDcly Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Only one of the three callers of rbd_do_request() provide a collection structure to aggregate status. If an error occurs in rbd_do_request(), have the caller take care of calling rbd_coll_end_req() if necessary in that one spot. Signed-off-by: Alex Elder --- drivers/block/rbd.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index fb727c0..835153e 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1128,12 +1128,8 @@ static int rbd_do_request(struct request *rq, struct ceph_osd_client *osdc; rbd_req = kzalloc(sizeof(*rbd_req), GFP_NOIO); - if (!rbd_req) { - if (coll) - rbd_coll_end_req_index(rq, coll, coll_index, - (s32) -ENOMEM, len); + if (!rbd_req) return -ENOMEM; - } if (coll) { rbd_req->coll = coll; @@ -1208,7 +1204,6 @@ done_err: bio_chain_put(rbd_req->bio); ceph_osdc_put_request(osd_req); done_pages: - rbd_coll_end_req(rbd_req, (s32) ret, len); kfree(rbd_req); return ret; } @@ -1361,7 +1356,9 @@ static int rbd_do_op(struct request *rq, ops, coll, coll_index, rbd_req_cb, 0, NULL); - + if (ret < 0) + rbd_coll_end_req_index(rq, coll, coll_index, + (s32) ret, seg_len); rbd_destroy_ops(ops); done: kfree(seg_name);