Permalink
Browse files

rbd: get rid of rbd_{get,put}_dev()

The functions rbd_get_dev() and rbd_put_dev() are trivial wrappers
that add no value, and their existence suggests they may do more
than what they do.

Get rid of them.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
  • Loading branch information...
1 parent c89ce05 commit c3e946ce7276faf0b302acd25c7b874edbeba661 Alex Elder committed Nov 16, 2012
Showing with 2 additions and 12 deletions.
  1. +2 −12 drivers/block/rbd.c
View
14 drivers/block/rbd.c
@@ -290,16 +290,6 @@ static struct device rbd_root_dev = {
# 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);
@@ -311,7 +301,7 @@ static int rbd_open(struct block_device *bdev, fmode_t mode)
return -EROFS;
mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
- rbd_get_dev(rbd_dev);
+ (void) get_device(&rbd_dev->dev);
set_device_ro(bdev, rbd_dev->mapping.read_only);
rbd_dev->open_count++;
mutex_unlock(&ctl_mutex);
@@ -326,7 +316,7 @@ static int rbd_release(struct gendisk *disk, fmode_t mode)
mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
rbd_assert(rbd_dev->open_count > 0);
rbd_dev->open_count--;
- rbd_put_dev(rbd_dev);
+ put_device(&rbd_dev->dev);
mutex_unlock(&ctl_mutex);
return 0;

0 comments on commit c3e946c

Please sign in to comment.