|
@@ -3400,7 +3400,6 @@ static void cancel_tasks_sync(struct rbd_device *rbd_dev)
|
|
|
{
|
|
|
dout("%s rbd_dev %p\n", __func__, rbd_dev);
|
|
|
|
|
|
- cancel_delayed_work_sync(&rbd_dev->watch_dwork);
|
|
|
cancel_work_sync(&rbd_dev->acquired_lock_work);
|
|
|
cancel_work_sync(&rbd_dev->released_lock_work);
|
|
|
cancel_delayed_work_sync(&rbd_dev->lock_dwork);
|
|
@@ -3418,6 +3417,7 @@ static void rbd_unregister_watch(struct rbd_device *rbd_dev)
|
|
|
rbd_dev->watch_state = RBD_WATCH_STATE_UNREGISTERED;
|
|
|
mutex_unlock(&rbd_dev->watch_mutex);
|
|
|
|
|
|
+ cancel_delayed_work_sync(&rbd_dev->watch_dwork);
|
|
|
ceph_osdc_flush_notifies(&rbd_dev->rbd_client->client->osdc);
|
|
|
}
|
|
|
|