rbd: get rid of rbd_{get,put}_dev()
Subsystems (2)
PATCH 1/1 rbd: get rid of rbd_{get,put}_dev()
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.
--- drivers/block/rbd.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/block/rbd.c +0 -0
@@ -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);
@@ -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;
}
Signature · 1 line
1.7.9.5
Quoted 54 lines · Alex Elder
The functions
rbd_get_dev()andrbd_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 <[email protected]>--- drivers/block/rbd.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)drivers/block/rbd.c +2
-12@@ -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);@@ -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 ;}