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

Commit 8836b995 authored by Alex Elder's avatar Alex Elder
Browse files

rbd: simplify snap_by_name() interface 



There is only one caller of snap_by_name(), and it passes two values
to be assigned, both of which are found within an rbd device
structure.

Change the interface so it just passes the address of the rbd_dev,
and make the assignments to its fields directly.

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

drivers/block/rbd.c

+6 −9
Original line number Original line Diff line number Diff line
@@ -621,10 +621,10 @@ static int rbd_header_from_disk(struct rbd_image_header *header, 
	return -ENOMEM;

	return -ENOMEM;

}

}





static int snap_by_name(struct rbd_image_header *header, const char *snap_name,

static int snap_by_name(struct rbd_device *rbd_dev, const char *snap_name)

			u64 *seq, u64 *size)

{

{

	int i;

	int i;

	struct rbd_image_header *header = &rbd_dev->header;

	char *p = header->snap_names;

	char *p = header->snap_names;





	rbd_assert(header->snapc != NULL);

	rbd_assert(header->snapc != NULL);
@@ -633,10 +633,9 @@ static int snap_by_name(struct rbd_image_header *header, const char *snap_name, 




			/* Found it.  Pass back its id and/or size */

			/* Found it.  Pass back its id and/or size */





			if (seq)

			rbd_dev->mapping.snap_id = header->snapc->snaps[i];

				*seq = header->snapc->snaps[i];

			rbd_dev->mapping.size = header->snap_sizes[i];

			if (size)



				*size = header->snap_sizes[i];

			return i;

			return i;

		}

		}

		p += strlen(p) + 1;	/* Skip ahead to the next name */

		p += strlen(p) + 1;	/* Skip ahead to the next name */
@@ -657,9 +656,7 @@ static int rbd_header_set_snap(struct rbd_device *rbd_dev, char *snap_name) 
		rbd_dev->mapping.snap_exists = false;

		rbd_dev->mapping.snap_exists = false;

		rbd_dev->mapping.read_only = rbd_dev->rbd_opts.read_only;

		rbd_dev->mapping.read_only = rbd_dev->rbd_opts.read_only;

	} else {

	} else {

		ret = snap_by_name(&rbd_dev->header, snap_name,

		ret = snap_by_name(rbd_dev, snap_name);

					&rbd_dev->mapping.snap_id,

					&rbd_dev->mapping.size);

		if (ret < 0)

		if (ret < 0)

			goto done;

			goto done;

		rbd_dev->mapping.snap_exists = true;

		rbd_dev->mapping.snap_exists = true;