From patchwork Thu Jan 3 22:51:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1929811 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 81B86DF25A for ; Thu, 3 Jan 2013 22:51:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754737Ab3ACWvu (ORCPT ); Thu, 3 Jan 2013 17:51:50 -0500 Received: from mail-ie0-f175.google.com ([209.85.223.175]:60426 "EHLO mail-ie0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754261Ab3ACWvt (ORCPT ); Thu, 3 Jan 2013 17:51:49 -0500 Received: by mail-ie0-f175.google.com with SMTP id qd14so19030598ieb.34 for ; Thu, 03 Jan 2013 14:51:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding:x-gm-message-state; bh=/LS85coufxJuCP4FNj2S0XY5LTKL9iz8ZWPlVdFRAno=; b=e6Wp9uqE9/s4CyNw0xAMr4pfGuW1rt3IfCnBJCfY0tKX2xYYjmSJchnhSLam4xsFl3 0jT3UJDJ3nOUCdUbvk+mHWQdcpOWEfiipkX5iXkdPYyXjh6tcxzwCwbXj02izonZNCfv AL0IeCiV6vIBNYqwpeN3L13JDL38jnGrIHEgoS5YzKry/NL5CszrovI0sg6JhSCgkJ2/ t3FfTauqdvpf3ZbuuM7HPUyLsBAT84ru7kEg7qYx4rkGVkc67EoAJ11wm2DXMNGcWJ1s QpdX1xT0ErXN6i7oiKMQ9ohS1PpSpmXhD/jeVLEsYVB05QG32C3kyjPGBpZHnOPRZIa7 k1PA== X-Received: by 10.50.158.201 with SMTP id ww9mr38528445igb.22.1357253509250; Thu, 03 Jan 2013 14:51:49 -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 i9sm45523380igl.9.2013.01.03.14.51.47 (version=SSLv3 cipher=OTHER); Thu, 03 Jan 2013 14:51:48 -0800 (PST) Message-ID: <50E60B83.2070703@inktank.com> Date: Thu, 03 Jan 2013 16:51:47 -0600 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: "ceph-devel@vger.kernel.org" Subject: [PATCH REPOST] rbd: end request on error in rbd_do_request() caller X-Gm-Message-State: ALoCoQnollYzNkxU3Zdq8rLF8QsreT6mA3tFuUUlZuUDICRQd5MLQKJIp5FVBGyrCQQO3UVEBXuG 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 Reviewed-by: Josh Durgin --- 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 0a35c34..1348825 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1126,12 +1126,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; @@ -1206,7 +1202,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; } @@ -1359,7 +1354,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);