diff options
| author | Josh Durgin <josh.durgin@inktank.com> | 2013-08-29 17:31:03 -0700 |
|---|---|---|
| committer | Josh Durgin <josh.durgin@inktank.com> | 2013-09-09 11:15:57 -0700 |
| commit | 9abc59908e0c5f983aaa91150da32d5b62cf60b7 (patch) | |
| tree | ed0a2756dad3db35e4f526accf32c8be0f158748 /drivers/block | |
| parent | dd935f44a40f8fb02aff2cc0df2269c92422df1c (diff) | |
rbd: complete notifies before cleaning up osd_client and rbd_dev
To ensure rbd_dev is not used after it's released, flush all pending
notify callbacks before calling rbd_dev_image_release(). No new
notifies can be added to the queue at this point because the watch has
already be unregistered with the osd_client.
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/rbd.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index fef3687c152..bf89e348d11 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -5163,6 +5163,13 @@ static ssize_t rbd_remove(struct bus_type *bus, ret = rbd_dev_header_watch_sync(rbd_dev, false); if (ret) rbd_warn(rbd_dev, "failed to cancel watch event (%d)\n", ret); + + /* + * flush remaining watch callbacks - these must be complete + * before the osd_client is shutdown + */ + dout("%s: flushing notifies", __func__); + ceph_osdc_flush_notifies(&rbd_dev->rbd_client->client->osdc); rbd_dev_image_release(rbd_dev); module_put(THIS_MODULE); |