Commit b8776051 authored Mar 16, 2020 by Ilya Dryomov

rbd: don't test rbd_dev->opts in rbd_dev_image_release()



rbd_dev->opts is used to distinguish between the image that is being
mapped and a parent.  However, because we no longer establish watch for
read-only mappings, this test is imprecise and results in unnecessary
rbd_unregister_watch() calls.

Make it consistent with need_watch in rbd_dev_image_probe().

Fixes: b9ef2b88 ("rbd: don't establish watch for read-only mappings")
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

parent 952c48b0

drivers/block/rbd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -6898,7 +6898,7 @@ static void rbd_print_dne(struct rbd_device *rbd_dev, bool is_snap)

		static void rbd_dev_image_release(struct rbd_device *rbd_dev)
		{
		if (rbd_dev->opts)
		if (!rbd_is_ro(rbd_dev))
		rbd_unregister_watch(rbd_dev);

		rbd_dev_unprobe(rbd_dev);

Admin message