diff options
author | Alex Elder <elder@inktank.com> | 2013-05-06 08:40:30 -0400 |
---|---|---|
committer | Alex Elder <elder@inktank.com> | 2013-05-08 08:48:12 -0400 |
commit | 6d80b130d516deef51666e210fde674c947b8b5c (patch) | |
tree | cac93400937474aa385e35971fe2f8bae6b9d70b | |
parent | 8f4b7d9821715767ac28bbc2d401bbb5f3f9a448 (diff) |
rbd: kill rbd_dev_clear_mapping()
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>
-rw-r--r-- | drivers/block/rbd.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 75a8cea1a2d0..a62e59a0aea7 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c | |||
@@ -966,13 +966,6 @@ static void rbd_dev_mapping_clear(struct rbd_device *rbd_dev) | |||
966 | rbd_dev->mapping.read_only = true; | 966 | rbd_dev->mapping.read_only = true; |
967 | } | 967 | } |
968 | 968 | ||
969 | static void rbd_dev_clear_mapping(struct rbd_device *rbd_dev) | ||
970 | { | ||
971 | rbd_dev->mapping.size = 0; | ||
972 | rbd_dev->mapping.features = 0; | ||
973 | rbd_dev->mapping.read_only = true; | ||
974 | } | ||
975 | |||
976 | static const char *rbd_segment_name(struct rbd_device *rbd_dev, u64 offset) | 969 | static const char *rbd_segment_name(struct rbd_device *rbd_dev, u64 offset) |
977 | { | 970 | { |
978 | char *name; | 971 | char *name; |
@@ -4910,7 +4903,7 @@ static void rbd_dev_device_release(struct device *dev) | |||
4910 | 4903 | ||
4911 | rbd_free_disk(rbd_dev); | 4904 | rbd_free_disk(rbd_dev); |
4912 | clear_bit(RBD_DEV_FLAG_EXISTS, &rbd_dev->flags); | 4905 | clear_bit(RBD_DEV_FLAG_EXISTS, &rbd_dev->flags); |
4913 | rbd_dev_clear_mapping(rbd_dev); | 4906 | rbd_dev_mapping_clear(rbd_dev); |
4914 | unregister_blkdev(rbd_dev->major, rbd_dev->name); | 4907 | unregister_blkdev(rbd_dev->major, rbd_dev->name); |
4915 | rbd_dev->major = 0; | 4908 | rbd_dev->major = 0; |
4916 | rbd_dev_id_put(rbd_dev); | 4909 | rbd_dev_id_put(rbd_dev); |