From patchwork Mon Oct 22 16:44:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1627051 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 96132DFB79 for ; Mon, 22 Oct 2012 16:44:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752274Ab2JVQon (ORCPT ); Mon, 22 Oct 2012 12:44:43 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:36039 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751501Ab2JVQom (ORCPT ); Mon, 22 Oct 2012 12:44:42 -0400 Received: by mail-ie0-f174.google.com with SMTP id k13so3899202iea.19 for ; Mon, 22 Oct 2012 09:44:42 -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=4ExX9W8fPH6HxM0VOZmQHogp8gLrpTCS3F7+lCefj8Q=; b=gbV+2hAMau18NXHJLrDCkIqVzhJtNBqgc8mGYPSM8yx3ShnvOWFkLnWtaQs9nrEFwd 7Eo5fhZTAy1Vk2ag2fBVPwu1CZK/nb111gzQlGnze6wNY+92MXe92hZRdcPPKVkBoaVm 36tAuY7O7Ozy3PD1eWJr9Rs7zn8fOg+oZR3fK7oF1kvKqkU4Q3jyy6Q2kGOZoBqOYl8u HymwdiTYYoplsBWeZcuq2yPTJlmNoDvnRFp03cgc+bsWweqxwAHPLEQG5iEzGuoAI8vk u2n68ZqvIn14NvzJu/Ms+tend3AnKFsNBVQrUJmhr8iQJb80Ut83DsHn9OGV9pBOnUqf hrlQ== Received: by 10.50.194.163 with SMTP id hx3mr9959683igc.37.1350924282260; Mon, 22 Oct 2012 09:44:42 -0700 (PDT) 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 us4sm22841637igc.9.2012.10.22.09.44.38 (version=SSLv3 cipher=OTHER); Mon, 22 Oct 2012 09:44:39 -0700 (PDT) Message-ID: <508577F5.3020102@inktank.com> Date: Mon, 22 Oct 2012 11:44:37 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 1/2] rbd: zero return code in rbd_dev_image_id() References: <508577B6.2020708@inktank.com> In-Reply-To: <508577B6.2020708@inktank.com> X-Gm-Message-State: ALoCoQnAdmgbB+9msZDm7BwrBrP+AXMkb7Q8NUmXggpAu+cosa+hLT50oQLVfsrXrtTZYenErBMl Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org There is a call in rbd_dev_image_id() to rbd_req_sync_exec() to get the image id for an image. Despite the "get_id" class method only returning 0 on success, I am getting back a positive value (I think the number of bytes returned with the call). That may or may not be how rbd_req_sync_exec() is supposed to behave, but zeroing the return value if successful makes it moot and makes this path through the code work as desired. Do the same in rbd_dev_v2_object_prefix(). Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 2 ++ 1 file changed, 2 insertions(+) rbd_dev->header.object_prefix = ceph_extract_encoded_string(&p, @@ -2862,6 +2863,7 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev) dout("%s: rbd_req_sync_exec returned %d\n", __func__, ret); if (ret < 0) goto out; + ret = 0; /* rbd_req_sync_exec() can return positive */ p = response; rbd_dev->image_id = ceph_extract_encoded_string(&p, diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index cf5d109..65e9f1f 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2169,6 +2169,7 @@ static int rbd_dev_v2_object_prefix(struct rbd_device *rbd_dev) dout("%s: rbd_req_sync_exec returned %d\n", __func__, ret); if (ret < 0) goto out; + ret = 0; /* rbd_req_sync_exec() can return positive */ p = reply_buf;