Skip to content

Commit

Permalink
rbd: kill rbd_dev_clear_mapping()
Browse files Browse the repository at this point in the history
This function is a duplicate of rbd_dev_mapping_clear(), and was
added by mistake.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
  • Loading branch information
Alex Elder committed May 8, 2013
1 parent 8f4b7d9 commit 6d80b13
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions drivers/block/rbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -966,13 +966,6 @@ static void rbd_dev_mapping_clear(struct rbd_device *rbd_dev)
rbd_dev->mapping.read_only = true;
}

static void rbd_dev_clear_mapping(struct rbd_device *rbd_dev)
{
rbd_dev->mapping.size = 0;
rbd_dev->mapping.features = 0;
rbd_dev->mapping.read_only = true;
}

static const char *rbd_segment_name(struct rbd_device *rbd_dev, u64 offset)
{
char *name;
Expand Down Expand Up @@ -4910,7 +4903,7 @@ static void rbd_dev_device_release(struct device *dev)

rbd_free_disk(rbd_dev);
clear_bit(RBD_DEV_FLAG_EXISTS, &rbd_dev->flags);
rbd_dev_clear_mapping(rbd_dev);
rbd_dev_mapping_clear(rbd_dev);
unregister_blkdev(rbd_dev->major, rbd_dev->name);
rbd_dev->major = 0;
rbd_dev_id_put(rbd_dev);
Expand Down

0 comments on commit 6d80b13

Please sign in to comment.