From patchwork Thu Jul 26 18:44:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1244081 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 5B93B3FC5A for ; Thu, 26 Jul 2012 18:45:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751941Ab2GZSpD (ORCPT ); Thu, 26 Jul 2012 14:45:03 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:59777 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752313Ab2GZSpB (ORCPT ); Thu, 26 Jul 2012 14:45:01 -0400 Received: by mail-gg0-f174.google.com with SMTP id u4so2311502ggl.19 for ; Thu, 26 Jul 2012 11:45:01 -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=qEllTS66bid937jguWrdL5R6bS/keUXdaf9qYtQxULY=; b=dzp3bznO+x1oqQ7YS7lw3kjRGmvsRGdgspF+D4eT4ujOQyE1Ed7o7s4NnufX2UqPil sI9FsYiDioja0ATB8YYgbIPzb4r5DP8evhySdDVb749QbxD8E4ja8haZknrB6qNFgTpS 5+R9GO4/gJzW66TAPE0h++nh95219wGSslRFbYSEZQ2OKvOi2U6i+qSSBd83ydi/zNKF niMQWUezWEXKqfHRe74dLKADARc9x5sLdmVmW+2q41F4b+jAgw3r/yoMZkaHNIylT9qj ZVwErMJzobrkNcAqstTYG7BdrUqPlqQOrJx++ozU+OyWbpcwkFAaqDoGMS4Qh1RiJv7A ODhA== Received: by 10.236.131.146 with SMTP id m18mr15252838yhi.65.1343328301237; Thu, 26 Jul 2012 11:45:01 -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 l12sm5393629ank.2.2012.07.26.11.45.00 (version=SSLv3 cipher=OTHER); Thu, 26 Jul 2012 11:45:00 -0700 (PDT) Message-ID: <5011902B.3000204@inktank.com> Date: Thu, 26 Jul 2012 13:44:59 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 3/6] rbd: clean up a few dout() calls References: <50118F33.7080502@inktank.com> In-Reply-To: <50118F33.7080502@inktank.com> X-Gm-Message-State: ALoCoQnbaV7uBeRzyKnvwHMKA6bMjcaUJdb4tBzR8VR1Wh277bhWEl0O9eNLISe4plTTjViYpJGV Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org There was a dout() call in rbd_do_request() that was reporting the offset as the length and vice versa. While fixing that I did a quick scan of other dout() calls and fixed a couple of other minor things. Signed-off-by: Alex Elder --- drivers/block/rbd.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) /* @@ -1664,7 +1663,7 @@ static int rbd_header_add_snap(struct rbd_device *rbd_dev, monc = &rbd_dev->rbd_client->client->monc; ret = ceph_monc_create_snapid(monc, rbd_dev->pool_id, &new_snapid); - dout("created snapid=%lld\n", new_snapid); + dout("created snapid=%llu\n", new_snapid); if (ret < 0) return ret; diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 74e6a33..93b2447 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -895,7 +895,7 @@ static int rbd_do_request(struct request *rq, } dout("rbd_do_request object_name=%s ofs=%lld len=%lld\n", - object_name, len, ofs); + object_name, ofs, len); osdc = &rbd_dev->rbd_client->client->osdc; req = ceph_osdc_alloc_request(osdc, flags, snapc, ops, @@ -1315,8 +1315,7 @@ static void rbd_notify_cb(u64 ver, u64 notify_id, u8 opcode, void *data) return; dout("rbd_notify_cb %s notify_id=%lld opcode=%d\n", - rbd_dev->header_name, - notify_id, (int)opcode); + rbd_dev->header_name, notify_id, (int) opcode); }