|
|
@@ -1139,6 +1139,13 @@ static void rbd_dev_mapping_clear(struct rbd_device *rbd_dev)
|
|
|
rbd_dev->mapping.features = 0;
|
|
|
}
|
|
|
|
|
|
+static void rbd_segment_name_free(const char *name)
|
|
|
+{
|
|
|
+ /* The explicit cast here is needed to drop the const qualifier */
|
|
|
+
|
|
|
+ kmem_cache_free(rbd_segment_name_cache, (void *)name);
|
|
|
+}
|
|
|
+
|
|
|
static const char *rbd_segment_name(struct rbd_device *rbd_dev, u64 offset)
|
|
|
{
|
|
|
char *name;
|
|
|
@@ -1158,20 +1165,13 @@ static const char *rbd_segment_name(struct rbd_device *rbd_dev, u64 offset)
|
|
|
if (ret < 0 || ret > CEPH_MAX_OID_NAME_LEN) {
|
|
|
pr_err("error formatting segment name for #%llu (%d)\n",
|
|
|
segment, ret);
|
|
|
- kfree(name);
|
|
|
+ rbd_segment_name_free(name);
|
|
|
name = NULL;
|
|
|
}
|
|
|
|
|
|
return name;
|
|
|
}
|
|
|
|
|
|
-static void rbd_segment_name_free(const char *name)
|
|
|
-{
|
|
|
- /* The explicit cast here is needed to drop the const qualifier */
|
|
|
-
|
|
|
- kmem_cache_free(rbd_segment_name_cache, (void *)name);
|
|
|
-}
|
|
|
-
|
|
|
static u64 rbd_segment_offset(struct rbd_device *rbd_dev, u64 offset)
|
|
|
{
|
|
|
u64 segment_size = (u64) 1 << rbd_dev->header.obj_order;
|