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

rbd: don't use index in __rbd_add_snap_dev() 



Pass the snapshot id and snapshot size rather than an index
to __rbd_add_snap_dev() to specify values for a new snapshot.

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

drivers/block/rbd.c

+8 −6
Original line number Original line Diff line number Diff line
@@ -2036,7 +2036,8 @@ static int rbd_register_snap_dev(struct rbd_snap *snap, 
}

}





static struct rbd_snap *__rbd_add_snap_dev(struct rbd_device *rbd_dev,

static struct rbd_snap *__rbd_add_snap_dev(struct rbd_device *rbd_dev,

					      int i, const char *name)

						const char *snap_name,

						u64 snap_id, u64 snap_size)

{

{

	struct rbd_snap *snap;

	struct rbd_snap *snap;

	int ret;

	int ret;
@@ -2046,12 +2047,12 @@ static struct rbd_snap *__rbd_add_snap_dev(struct rbd_device *rbd_dev, 
		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);





	ret = -ENOMEM;

	ret = -ENOMEM;

	snap->name = kstrdup(name, GFP_KERNEL);

	snap->name = kstrdup(snap_name, GFP_KERNEL);

	if (!snap->name)

	if (!snap->name)

		goto err;

		goto err;





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

	snap->id = snap_id;

	snap->id = rbd_dev->header.snapc->snaps[i];

	snap->size = snap_size;





	return snap;

	return snap;
@@ -2116,12 +2117,13 @@ static int rbd_dev_snaps_update(struct rbd_device *rbd_dev) 
		dout("entry %u: snap_id = %llu\n", (unsigned int) snap_count,

		dout("entry %u: snap_id = %llu\n", (unsigned int) snap_count,

			(unsigned long long) snap_id);

			(unsigned long long) snap_id);

		if (!snap || (snap_id != CEPH_NOSNAP && snap->id < snap_id)) {

		if (!snap || (snap_id != CEPH_NOSNAP && snap->id < snap_id)) {

			struct rbd_image_header	*header = &rbd_dev->header;

			struct rbd_snap *new_snap;

			struct rbd_snap *new_snap;





			/* We haven't seen this snapshot before */

			/* We haven't seen this snapshot before */





			new_snap = __rbd_add_snap_dev(rbd_dev, index,

			new_snap = __rbd_add_snap_dev(rbd_dev, snap_name,

							snap_name);

					snap_id, header->snap_sizes[index]);

			if (IS_ERR(new_snap)) {

			if (IS_ERR(new_snap)) {

				int err = PTR_ERR(new_snap);

				int err = PTR_ERR(new_snap);