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

Commit c9aadfe7 authored by Alex Elder's avatar Alex Elder
Browse files

rbd: kill rbd_image_header->total_snaps 



The "total_snaps" field in an rbd header structure is never any
different from the value of "num_snaps" stored within a snapshot
context.  Avoid any confusion by just using the value held within
the snapshot context, and get rid of the "total_snaps" field.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 98cec111

drivers/block/rbd.c

+2 −4
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ struct rbd_image_header { 
	__u8 crypt_type;

	__u8 comp_type;

	struct ceph_snap_context *snapc;

	u32 total_snaps;



	char *snap_names;

	u64 *snap_sizes;
@@ -588,7 +587,6 @@ static int rbd_header_from_disk(struct rbd_image_header *header, 
	header->obj_order = ondisk->options.order;

	header->crypt_type = ondisk->options.crypt_type;

	header->comp_type = ondisk->options.comp_type;

	header->total_snaps = snap_count;



	/* Allocate and fill in the snapshot context */
@@ -624,7 +622,8 @@ static int snap_by_name(struct rbd_image_header *header, const char *snap_name, 
	int i;

	char *p = header->snap_names;



	for (i = 0; i < header->total_snaps; i++) {

	rbd_assert(header->snapc != NULL);

	for (i = 0; i < header->snapc->num_snaps; i++) {

		if (!strcmp(snap_name, p)) {



			/* Found it.  Pass back its id and/or size */
@@ -1839,7 +1838,6 @@ static int __rbd_refresh_header(struct rbd_device *rbd_dev, u64 *hver) 
		*hver = h.obj_version;

	rbd_dev->header.obj_version = h.obj_version;

	rbd_dev->header.image_size = h.image_size;

	rbd_dev->header.total_snaps = h.total_snaps;

	rbd_dev->header.snapc = h.snapc;

	rbd_dev->header.snap_names = h.snap_names;

	rbd_dev->header.snap_sizes = h.snap_sizes;