Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull Ceph fix from Sage Weil:
"This fixes a problem preventing the kernel and userland librbd
libraries from sharing data with the new format 2 images"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
rbd: use the correct length for format 2 object names
+5
-1
+5
-1
drivers/block/rbd.c
+5
-1
drivers/block/rbd.c
···
1036
1036
char *name;
1037
1037
u64 segment;
1038
1038
int ret;
1039
+
char *name_format;
1039
1040
1040
1041
name = kmem_cache_alloc(rbd_segment_name_cache, GFP_NOIO);
1041
1042
if (!name)
1042
1043
return NULL;
1043
1044
segment = offset >> rbd_dev->header.obj_order;
1044
-
ret = snprintf(name, MAX_OBJ_NAME_SIZE + 1, "%s.%012llx",
1045
+
name_format = "%s.%012llx";
1046
+
if (rbd_dev->image_format == 2)
1047
+
name_format = "%s.%016llx";
1048
+
ret = snprintf(name, MAX_OBJ_NAME_SIZE + 1, name_format,
1045
1049
rbd_dev->header.object_prefix, segment);
1046
1050
if (ret < 0 || ret > MAX_OBJ_NAME_SIZE) {
1047
1051
pr_err("error formatting segment name for #%llu (%d)\n",