| Message ID | 20220330052917.2566582-2-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/15] nbd: use the correct block_device in nbd_bdev_reset | expand |
On Wed, 30 Mar 2022 07:29:03 +0200, Christoph Hellwig wrote: > The bdev parameter to ->ioctl contains the block device that the ioctl > is called on, which can be the partition. But the openers check in > nbd_bdev_reset really needs to check use the whole device, so switch to > using that. > > Applied, thanks! [01/15] nbd: use the correct block_device in nbd_bdev_reset commit: 2a852a693f8839bb877fc731ffbc9ece3a9c16d7 [02/15] zram: cleanup reset_store commit: d666e20e2e7983d03bbf5e208b8485541ae616a1 [03/15] zram: cleanup zram_remove commit: 7a86d6dc1493326feb0d3ce5af2f34401dd3defa [04/15] block: add a disk_openers helper commit: dbdc1be32591af023db2812706f01e6cd2f42bfc [05/15] block: turn bdev->bd_openers into an atomic_t commit: 9acf381f3e8f715175c29f4b6d722f6b6797d139 [06/15] loop: de-duplicate the idle worker freeing code commit: 2cf429b53c1041a0e90943e1d2a5a7a7f89accb0 [07/15] loop: initialize the worker tracking fields once commit: b15ed54694fbba714931dd81790f86797cf8bed2 [08/15] loop: remove the racy bd_inode->i_mapping->nrpages asserts commit: 98ded54a33839e7b8f8bed772e01a544f48e33a7 [09/15] loop: don't freeze the queue in lo_release commit: 46dc967445bde5300eee7e567a67796de2217586 [10/15] loop: only freeze the queue in __loop_clr_fd when needed commit: 1fe0b1acb14dd3113b7dc975a118cd7f08af8316 [11/15] loop: implement ->free_disk commit: d2c7f56f8b5256d57f9e3fc7794c31361d43bdd9 [12/15] loop: suppress uevents while reconfiguring the device commit: 498ef5c777d9c89693b70cc453b40c392120ea1b [13/15] loop: avoid loop_validate_mutex/lo_mutex in ->release commit: 158eaeba4b8edf9940f64daa83cbd1ac7db7593c [14/15] loop: remove lo_refcount and avoid lo_mutex in ->open / ->release commit: a0e286b6a5b61d4da01bdf865071c4da417046d6 [15/15] loop: don't destroy lo->workqueue in __loop_clr_fd commit: d292dc80686aeafc418d809b4f9598578a7f294f Best regards,
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 5a1f98494dddf..2f29da41fbc80 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1217,11 +1217,11 @@ static int nbd_reconnect_socket(struct nbd_device *nbd, unsigned long arg) return -ENOSPC; } -static void nbd_bdev_reset(struct block_device *bdev) +static void nbd_bdev_reset(struct nbd_device *nbd) { - if (bdev->bd_openers > 1) + if (nbd->disk->part0->bd_openers > 1) return; - set_capacity(bdev->bd_disk, 0); + set_capacity(nbd->disk, 0); } static void nbd_parse_flags(struct nbd_device *nbd) @@ -1389,7 +1389,7 @@ static int nbd_start_device(struct nbd_device *nbd) return nbd_set_size(nbd, config->bytesize, nbd_blksize(config)); } -static int nbd_start_device_ioctl(struct nbd_device *nbd, struct block_device *bdev) +static int nbd_start_device_ioctl(struct nbd_device *nbd) { struct nbd_config *config = nbd->config; int ret; @@ -1408,7 +1408,7 @@ static int nbd_start_device_ioctl(struct nbd_device *nbd, struct block_device *b flush_workqueue(nbd->recv_workq); mutex_lock(&nbd->config_lock); - nbd_bdev_reset(bdev); + nbd_bdev_reset(nbd); /* user requested, ignore socket errors */ if (test_bit(NBD_RT_DISCONNECT_REQUESTED, &config->runtime_flags)) ret = 0; @@ -1422,7 +1422,7 @@ static void nbd_clear_sock_ioctl(struct nbd_device *nbd, { sock_shutdown(nbd); __invalidate_device(bdev, true); - nbd_bdev_reset(bdev); + nbd_bdev_reset(nbd); if (test_and_clear_bit(NBD_RT_HAS_CONFIG_REF, &nbd->config->runtime_flags)) nbd_config_put(nbd); @@ -1468,7 +1468,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, config->flags = arg; return 0; case NBD_DO_IT: - return nbd_start_device_ioctl(nbd, bdev); + return nbd_start_device_ioctl(nbd); case NBD_CLEAR_QUE: /* * This is for compatibility only. The queue is always cleared