3.11.10.3 -stable review patch. If anyone has any objections, please let me know.
------------------ From: Josh Durgin <[email protected]> commit 9abc59908e0c5f983aaa91150da32d5b62cf60b7 upstream. 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 <[email protected]> Reviewed-by: Alex Elder <[email protected]> Signed-off-by: Luis Henriques <[email protected]> --- drivers/block/rbd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 853e622..16f6966 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); -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
