Commit efadc98a authored Aug 29, 2013 by Josh Durgin

rbd: ignore unmapped snapshots that no longer exist



This prevents erroring out while adding a device when a snapshot
unrelated to the current mapping is deleted between reading the
snapshot context and reading the snapshot names. If the mapped
snapshot name is not found an error still occurs as usual.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: Alex Elder <elder@linaro.org>

parent 9875201e

drivers/block/rbd.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -4078,8 +4078,13 @@ static u64 rbd_v2_snap_id_by_name(struct rbd_device rbd_dev, const char name)

		snap_id = snapc->snaps[which];
		snap_name = rbd_dev_v2_snap_name(rbd_dev, snap_id);
		if (IS_ERR(snap_name))
		if (IS_ERR(snap_name)) {
		/* ignore no-longer existing snapshots */
		if (PTR_ERR(snap_name) == -ENOENT)
		continue;
		else
		break;
		}
		found = !strcmp(name, snap_name);
		kfree(snap_name);
		}

Admin message