From patchwork Wed May 8 22:08:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2541961 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 DDE3E3FC5A for ; Wed, 8 May 2013 22:08:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752791Ab3EHWIn (ORCPT ); Wed, 8 May 2013 18:08:43 -0400 Received: from mail-ob0-f172.google.com ([209.85.214.172]:47931 "EHLO mail-ob0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751996Ab3EHWIm (ORCPT ); Wed, 8 May 2013 18:08:42 -0400 Received: by mail-ob0-f172.google.com with SMTP id fb19so1080402obc.31 for ; Wed, 08 May 2013 15:08:42 -0700 (PDT) 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 :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=rLdxarYDto5GzODTWYsZNddZ57UNvLSx+rUtv1VazyY=; b=SLTnavlnFVIO5iWSB4KHp/oncR4XK/0Nvz8n4X80Gu45Rr+wqLa+JznvK69zzNNF8M F3YorGybHUGOqXKzt+u4NXOaTAAZnq5Rdsrr4ycwi3wtUb1tZbPsnA76e0Q5nGFhkf5b 69ppDDv+/d84BGoHKqxSe8uqMMYcbAE6SX7Vol4w2myyn97sa7ZHe9SXozBRBqdkzdJ+ MMrb12acWlXj/UpGbNRgCgGZsxgONs4VNNv1Mf/UGhKDOoA939m/KUxvDPlpYmBf5aUx sRaHJZBgOWA8cZngIHAccbGsQhqAMtIjPD3CrNHIqOW9SKYRh3XkiyqifWINo7ciQ7oP 9rRQ== X-Received: by 10.182.96.135 with SMTP id ds7mr2761917obb.45.1368050922190; Wed, 08 May 2013 15:08: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 ESMTPSA id n5sm292155obi.8.2013.05.08.15.08.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 May 2013 15:08:41 -0700 (PDT) Message-ID: <518ACCE9.3010203@inktank.com> Date: Wed, 08 May 2013 17:08:41 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 5/5] rbd: kill rbd_img_request_get() References: <518ACC55.7090100@inktank.com> In-Reply-To: <518ACC55.7090100@inktank.com> X-Gm-Message-State: ALoCoQkiq2lEnDoHm67nsHkhs6Yr/hNUMhzsnsXekv3v4nYLVBy7jrwLbK8z2IZ7apcOGmJzWXkV Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Get rid of rbd_img_request_get(), because it isn't used, and maybe won't ever be needed. Signed-off-by: Alex Elder --- drivers/block/rbd.c | 10 ---------- 1 file changed, 10 deletions(-) { @@ -1888,9 +1881,6 @@ static struct rbd_img_request *rbd_img_request_create( INIT_LIST_HEAD(&img_request->obj_requests); kref_init(&img_request->kref); - rbd_img_request_get(img_request); /* Avoid a warning */ - rbd_img_request_put(img_request); /* TEMPORARY */ - dout("%s: rbd_dev %p %s %llu/%llu -> img %p\n", __func__, rbd_dev, write_request ? "write" : "read", offset, length, img_request); diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index e417704..51c45e7 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1357,13 +1357,6 @@ static void rbd_obj_request_put(struct rbd_obj_request *obj_request) kref_put(&obj_request->kref, rbd_obj_request_destroy); } -static void rbd_img_request_get(struct rbd_img_request *img_request) -{ - dout("%s: img %p (was %d)\n", __func__, img_request, - atomic_read(&img_request->kref.refcount)); - kref_get(&img_request->kref); -} - static void rbd_img_request_destroy(struct kref *kref); static void rbd_img_request_put(struct rbd_img_request *img_request)