diff options
| author |   Ilya Dryomov <idryomov@gmail.com> | 2020-03-16 17:16:28 +0100 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2020-04-13 08:55:49 +0200 |
| commit | b8776051529230f76e464d5ffc5d1cf8465576bf (patch) | |
| tree | e11ac47ff54f5db33102937957b74627a1b9a449 /drivers/block/rbd.c | |
| parent | rbd: call rbd_dev_unprobe() after unwatching and flushing notifies (diff) | |
| download | linux-dev-b8776051529230f76e464d5ffc5d1cf8465576bf.tar.xz linux-dev-b8776051529230f76e464d5ffc5d1cf8465576bf.zip | |
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: b9ef2b8858a0 ("rbd: don't establish watch for read-only mappings")
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/block/rbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 7aec8bc5df6e..205192a5ec8f 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -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); |