Commit 2d0ebc5d authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

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: default avatarIlya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent e8221464

drivers/block/rbd.c

+3 −3
Original line number Diff line number Diff line
@@ -1088,9 +1088,9 @@ static const char *rbd_segment_name(struct rbd_device *rbd_dev, u64 offset) 
	name_format = "%s.%012llx";

	if (rbd_dev->image_format == 2)

		name_format = "%s.%016llx";

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

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

			rbd_dev->header.object_prefix, segment);

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

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

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

			segment, ret);

		kfree(name);
@@ -5350,7 +5350,7 @@ static int rbd_slab_init(void) 


	rbd_assert(!rbd_segment_name_cache);

	rbd_segment_name_cache = kmem_cache_create("rbd_segment_name",

					MAX_OBJ_NAME_SIZE + 1, 1, 0, NULL);

					CEPH_MAX_OID_NAME_LEN + 1, 1, 0, NULL);

	if (rbd_segment_name_cache)

		return 0;

out_err:

include/linux/ceph/osd_client.h

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 * Maximum object name size 

 * (must be at least as big as RBD_MAX_MD_NAME_LEN -- currently 100) 

 */

#define MAX_OBJ_NAME_SIZE 100

#define CEPH_MAX_OID_NAME_LEN 100



struct ceph_msg;

struct ceph_snap_context;
@@ -161,7 +161,7 @@ struct ceph_osd_request { 


	struct ceph_object_locator r_oloc;



	char              r_oid[MAX_OBJ_NAME_SIZE];          /* object name */

	char              r_oid[CEPH_MAX_OID_NAME_LEN];      /* object name */

	int               r_oid_len;

	u64               r_snapid;

	unsigned long     r_stamp;            /* send OR check time */

net/ceph/osd_client.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc, 
	msg_size = 4 + 4 + 8 + 8 + 4+8;

	msg_size += 2 + 4 + 8 + 4 + 4; /* oloc */

	msg_size += 1 + 8 + 4 + 4;     /* pg_t */

	msg_size += 4 + MAX_OBJ_NAME_SIZE;

	msg_size += 4 + CEPH_MAX_OID_NAME_LEN; /* oid */

	msg_size += 2 + num_ops*sizeof(struct ceph_osd_op);

	msg_size += 8;  /* snapid */

	msg_size += 8;  /* snap_seq */