Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ecba6f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a3d5c346 3a96d5cd

drivers/block/rbd.c

+5 −1
Original line number Diff line number Diff line
@@ -1036,12 +1036,16 @@ static const char *rbd_segment_name(struct rbd_device *rbd_dev, u64 offset) 
	char *name;

	u64 segment;

	int ret;

	char *name_format;



	name = kmem_cache_alloc(rbd_segment_name_cache, GFP_NOIO);

	if (!name)

		return NULL;

	segment = offset >> rbd_dev->header.obj_order;

	ret = snprintf(name, MAX_OBJ_NAME_SIZE + 1, "%s.%012llx",

	name_format = "%s.%012llx";

	if (rbd_dev->image_format == 2)

		name_format = "%s.%016llx";

	ret = snprintf(name, MAX_OBJ_NAME_SIZE + 1, name_format,

			rbd_dev->header.object_prefix, segment);

	if (ret < 0 || ret > MAX_OBJ_NAME_SIZE) {

		pr_err("error formatting segment name for #%llu (%d)\n",