From patchwork Mon Oct 15 13:44:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1594191 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id EDD613FD86 for ; Mon, 15 Oct 2012 13:44:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753501Ab2JONoM (ORCPT ); Mon, 15 Oct 2012 09:44:12 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:36454 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753375Ab2JONoK (ORCPT ); Mon, 15 Oct 2012 09:44:10 -0400 Received: by mail-ie0-f174.google.com with SMTP id k13so7773979iea.19 for ; Mon, 15 Oct 2012 06:44:10 -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 :content-type:content-transfer-encoding:x-gm-message-state; bh=50deF+lnDTJ6tON4orzJGIyeqIz8dGNrbqIAt79v3kQ=; b=VYahC8q32/QVhNgWsknfIsl5CIunqV4WOq5lrfHqHG6DYADjq1mY8V5Sw7aJfijLUC 7+1B+PpyGmjjh17LT1/z3p2eFUuVoj3Lj9tW5Kiw+kH9kHir+Xwz6GtOzUWR+1cSsvp1 C/MyhtG6cEevngo5ILJ3RQb/wVVaRvZOEYoEOBROVhh99JpIHZIUBBJFMnUIQ0usVt+F Ix2PYIOk862iVPPDX+9vSSK+SvMC2Xrz4ZIkxZKy4BEvg/Vrf9OKSTE4l9jCY+saWh8q FI6JPuT7Z+32HwD+8dqTGhpWeDBvUb4hOAcvG9ZeaabrBsDQslhbgKZNh7QaA1hSwzE9 JyDQ== Received: by 10.50.187.134 with SMTP id fs6mr8579275igc.61.1350308650298; Mon, 15 Oct 2012 06:44:10 -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 bg2sm5999666igb.1.2012.10.15.06.44.08 (version=SSLv3 cipher=OTHER); Mon, 15 Oct 2012 06:44:09 -0700 (PDT) Message-ID: <507C1328.2010107@inktank.com> Date: Mon, 15 Oct 2012 08:44:08 -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] rbd: zero return code in rbd_dev_image_id() X-Gm-Message-State: ALoCoQnRmHeF8UiAhQ9nkG1DHz/BnFM2nU6ajcaJvgYzgmk1PWnWlvHPf5SaqYL0J53g7JpFjG9L 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 --- drivers/block/rbd.c | 2 ++ 1 file changed, 2 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: b/drivers/block/rbd.c =================================================================== --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2207,6 +2207,7 @@ static int rbd_dev_v2_object_prefix(stru 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; rbd_dev->header.object_prefix = ceph_extract_encoded_string(&p, @@ -2900,6 +2901,7 @@ static int rbd_dev_image_id(struct rbd_d 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,