From patchwork Fri Nov 16 15:43:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1756001 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 933B5DFF38 for ; Fri, 16 Nov 2012 15:43:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752528Ab2KPPng (ORCPT ); Fri, 16 Nov 2012 10:43:36 -0500 Received: from mail-ie0-f174.google.com ([209.85.223.174]:35445 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752432Ab2KPPnf (ORCPT ); Fri, 16 Nov 2012 10:43:35 -0500 Received: by mail-ie0-f174.google.com with SMTP id k13so3763320iea.19 for ; Fri, 16 Nov 2012 07:43:34 -0800 (PST) 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=NIiGXSOT4mJvEQx38bJ/1bACF61qPDMzFL8zG17rgvk=; b=IvjntQh7ej64BO2777WJmLlbgT8TJ6cUS0McuseMI7mU6DY1QA59eW+6DwTaY4aX4f 1XKsWJK0F4dT4Tm8MX+c24i0fToMzXLL7sozG5j2LRzwx15BOUooeT58C8fxVyRkORf9 v1FHFNvFHLyP2geMBl4eE7UPPCfg89HuYHZWxLomv8BRtbE2TL9OqeGZem0ek0kVfn2N FZhFQOwIAt9HbeXPwSsTzcvEF51KXAtWymKZEPWnS/wNYo4bjmkAZxssChJuY7XxXeik Eo5Nq3xqhO+ptYYzmTxudme2JxCHxIG6hrWKZsr9h6FyyQZSLZQ+JlJ1v136cTqVOWNX 2wcg== Received: by 10.50.0.168 with SMTP id 8mr3756360igf.36.1353080614506; Fri, 16 Nov 2012 07:43:34 -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 ex10sm568821igc.15.2012.11.16.07.43.33 (version=SSLv3 cipher=OTHER); Fri, 16 Nov 2012 07:43:33 -0800 (PST) Message-ID: <50A65F24.7000002@inktank.com> Date: Fri, 16 Nov 2012 09:43:32 -0600 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: ceph-devel Subject: [PATCH] rbd: get rid of rbd_{get,put}_dev() X-Gm-Message-State: ALoCoQmVmeilx8HqYRhJA4XaWR6E3SZdZN/BtKhbIb2WK8hs5wMJ6NT0NDlBQkJxAJNWb+ksLwLO Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org The functions rbd_get_dev() and rbd_put_dev() are trivial wrappers that add no values, and their existence suggests they may do more than what they do. Get rid of them. Signed-off-by: Alex Elder Reviewed-by: Dan Mick --- drivers/block/rbd.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) @@ -357,7 +347,7 @@ static int rbd_open(struct block_device *bdev, fmode_t mode) if ((mode & FMODE_WRITE) && rbd_dev->mapping.read_only) return -EROFS; - rbd_get_dev(rbd_dev); + (void) get_device(&rbd_dev->dev); set_device_ro(bdev, rbd_dev->mapping.read_only); rbd_dev->open_count++; @@ -370,7 +360,7 @@ static int rbd_release(struct gendisk *disk, fmode_t mode) rbd_assert(rbd_dev->open_count > 0); rbd_dev->open_count--; - rbd_put_dev(rbd_dev); + put_device(&rbd_dev->dev); return 0; } diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 9d9a2f3..f4b5a64 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -337,16 +337,6 @@ void rbd_warn(struct rbd_device *rbd_dev, const char *fmt, ...) # define rbd_assert(expr) ((void) 0) #endif /* !RBD_DEBUG */ -static struct device *rbd_get_dev(struct rbd_device *rbd_dev) -{ - return get_device(&rbd_dev->dev); -} - -static void rbd_put_dev(struct rbd_device *rbd_dev) -{ - put_device(&rbd_dev->dev); -} - static int rbd_dev_refresh(struct rbd_device *rbd_dev, u64 *hver); static int rbd_dev_v2_refresh(struct rbd_device *rbd_dev, u64 *hver);