diff options
author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-01-27 10:40:18 -0500 |
---|---|---|
committer | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-01-27 16:57:24 -0500 |
commit | 2d0ebc5d591f49131bf8f93b54c5424162c3fb7f (patch) | |
tree | 4dd2bea3545eed25d70685d1f96e72be5b319958 /drivers/block | |
parent | e8221464fc2bc8c9f7b0c2115abbd75ba23f210a (diff) |
libceph: rename MAX_OBJ_NAME_SIZE to CEPH_MAX_OID_NAME_LEN
In preparation for adding oid abstraction, rename MAX_OBJ_NAME_SIZE to
CEPH_MAX_OID_NAME_LEN.
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/rbd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 6614e8d95525..98792b2a7f65 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c | |||
@@ -1088,9 +1088,9 @@ static const char *rbd_segment_name(struct rbd_device *rbd_dev, u64 offset) | |||
1088 | name_format = "%s.%012llx"; | 1088 | name_format = "%s.%012llx"; |
1089 | if (rbd_dev->image_format == 2) | 1089 | if (rbd_dev->image_format == 2) |
1090 | name_format = "%s.%016llx"; | 1090 | name_format = "%s.%016llx"; |
1091 | ret = snprintf(name, MAX_OBJ_NAME_SIZE + 1, name_format, | 1091 | ret = snprintf(name, CEPH_MAX_OID_NAME_LEN + 1, name_format, |
1092 | rbd_dev->header.object_prefix, segment); | 1092 | rbd_dev->header.object_prefix, segment); |
1093 | if (ret < 0 || ret > MAX_OBJ_NAME_SIZE) { | 1093 | if (ret < 0 || ret > CEPH_MAX_OID_NAME_LEN) { |
1094 | pr_err("error formatting segment name for #%llu (%d)\n", | 1094 | pr_err("error formatting segment name for #%llu (%d)\n", |
1095 | segment, ret); | 1095 | segment, ret); |
1096 | kfree(name); | 1096 | kfree(name); |
@@ -5350,7 +5350,7 @@ static int rbd_slab_init(void) | |||
5350 | 5350 | ||
5351 | rbd_assert(!rbd_segment_name_cache); | 5351 | rbd_assert(!rbd_segment_name_cache); |
5352 | rbd_segment_name_cache = kmem_cache_create("rbd_segment_name", | 5352 | rbd_segment_name_cache = kmem_cache_create("rbd_segment_name", |
5353 | MAX_OBJ_NAME_SIZE + 1, 1, 0, NULL); | 5353 | CEPH_MAX_OID_NAME_LEN + 1, 1, 0, NULL); |
5354 | if (rbd_segment_name_cache) | 5354 | if (rbd_segment_name_cache) |
5355 | return 0; | 5355 | return 0; |
5356 | out_err: | 5356 | out_err: |