Re: [PATCH 1/2] nfs/blocklayout: Don't attempt unregister for invalid block device
From: Christoph Hellwig
Date: Tue Nov 19 2024 - 07:42:29 EST
On Mon, Nov 18, 2024 at 05:40:40PM -0500, Benjamin Coddington wrote:
> Since commit d869da91cccb, an unmount of a pNFS SCSI layout-enabled NFS
Please also spell out the commit subject in the commit log body, similar
to to the Fixes tag.
> index 6252f4447945..7ae79814f4ff 100644
> --- a/fs/nfs/blocklayout/dev.c
> +++ b/fs/nfs/blocklayout/dev.c
> @@ -16,13 +16,16 @@
>
> static void bl_unregister_scsi(struct pnfs_block_dev *dev)
> {
> - struct block_device *bdev = file_bdev(dev->bdev_file);
> - const struct pr_ops *ops = bdev->bd_disk->fops->pr_ops;
> + struct block_device *bdev;
> + const struct pr_ops *ops;
> int status;
>
> if (!test_and_clear_bit(PNFS_BDEV_REGISTERED, &dev->flags))
> return;
>
> + bdev = file_bdev(dev->bdev_file);
> + ops = bdev->bd_disk->fops->pr_ops;
> +
Hmm. Just moving the test_and_clear_bit to the caller would
feel cleaner than this to me.
But either way the change looks good:
Reviewed-by: Christoph Hellwig <hch@xxxxxx>