Currently, a watch on an rbd device header object gets torn down
when its final Linux device reference gets dropped. Instead, tear
it down when removing the device. If an error occurs cleaning up
the watch event when unmapping, abort the unmap request.
All images (including parents) still get watch requests set up, so
tear these down also, in rbd_dev_remove_parent(). For now, ignore
any errors that occur in this case.
Get rid of local variable "rc" in rbd_remove(); use "ret" instead
(they both somehow ended up defined in the function and only one is
needed).
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
static int rbd_dev_probe_finish(struct rbd_device *rbd_dev)
{
int ret;
static int rbd_dev_probe_finish(struct rbd_device *rbd_dev)
{
int ret;
ret = rbd_dev_header_watch_sync(rbd_dev, 1);
if (ret)
ret = rbd_dev_header_watch_sync(rbd_dev, 1);
if (ret)
unregister_blkdev(rbd_dev->major, rbd_dev->name);
err_out_id:
rbd_dev_id_put(rbd_dev);
unregister_blkdev(rbd_dev->major, rbd_dev->name);
err_out_id:
rbd_dev_id_put(rbd_dev);
+ tmp = rbd_dev_header_watch_sync(rbd_dev, 0);
+ if (tmp)
+ rbd_warn(rbd_dev, "failed to cancel watch event (%d)\n", ret);
rbd_dev_mapping_clear(rbd_dev);
return ret;
rbd_dev_mapping_clear(rbd_dev);
return ret;
{
struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);
{
struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);
- if (rbd_dev->watch_event)
- rbd_dev_header_watch_sync(rbd_dev, 0);
-
/* clean up and free blkdev */
rbd_free_disk(rbd_dev);
unregister_blkdev(rbd_dev->major, rbd_dev->name);
/* clean up and free blkdev */
rbd_free_disk(rbd_dev);
unregister_blkdev(rbd_dev->major, rbd_dev->name);
struct rbd_device *first = rbd_dev;
struct rbd_device *second = first->parent;
struct rbd_device *third;
struct rbd_device *first = rbd_dev;
struct rbd_device *second = first->parent;
struct rbd_device *third;
/*
* Follow to the parent with no grandparent and
/*
* Follow to the parent with no grandparent and
second = third;
}
rbd_assert(second);
second = third;
}
rbd_assert(second);
+ ret = rbd_dev_header_watch_sync(rbd_dev, 0);
+ if (ret)
+ rbd_warn(rbd_dev,
+ "failed to cancel watch event (%d)\n", ret);
rbd_remove_all_snaps(second);
rbd_bus_del_dev(second);
first->parent = NULL;
rbd_remove_all_snaps(second);
rbd_bus_del_dev(second);
first->parent = NULL;
size_t count)
{
struct rbd_device *rbd_dev = NULL;
size_t count)
{
struct rbd_device *rbd_dev = NULL;
- rc = strict_strtoul(buf, 10, &ul);
- if (rc)
- return rc;
+ ret = strict_strtoul(buf, 10, &ul);
+ if (ret)
+ return ret;
/* convert to int; abort if we lost anything in the conversion */
target_id = (int) ul;
/* convert to int; abort if we lost anything in the conversion */
target_id = (int) ul;
+ ret = rbd_dev_header_watch_sync(rbd_dev, 0);
+ if (ret) {
+ rbd_warn(rbd_dev, "failed to cancel watch event (%d)\n", ret);
+ clear_bit(RBD_DEV_FLAG_REMOVING, &rbd_dev->flags);
+ smp_mb();
+ return ret;
+ }
+ ret = count;
+
rbd_dev_remove_parent(rbd_dev);
rbd_remove_all_snaps(rbd_dev);
rbd_dev_remove_parent(rbd_dev);
rbd_remove_all_snaps(rbd_dev);