Re: [PATCH] sr: Fix sr_block_release()

["Merlijn B.W. Wajer" <merlijn@archive.org>]

Hi,

Oops, looks like Simon (CC) reported this earlier on too, missed that.

On 30/03/2020 04:51, Bart Van Assche wrote:
> This patch fixes the following two complaints:

Acked-By: Merlijn Wajer <merlijn@archive.org>

Cheers,
Merlijn

> 
> [snip]
> 
> Cc: Merlijn Wajer <merlijn@archive.org>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: <stable@kernel.org>
> Fixes: 51a858817dcd ("scsi: sr: get rid of sr global mutex")
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> ---
>  drivers/scsi/sr.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
> index 0f1a926f6341..e8b2e014770c 100644
> --- a/drivers/scsi/sr.c
> +++ b/drivers/scsi/sr.c
> @@ -551,10 +551,12 @@ static int sr_block_open(struct block_device *bdev, fmode_t mode)
>  static void sr_block_release(struct gendisk *disk, fmode_t mode)
>  {
>  	struct scsi_cd *cd = scsi_cd(disk);
> +
>  	mutex_lock(&cd->lock);
>  	cdrom_release(&cd->cdi, mode);
> -	scsi_cd_put(cd);
>  	mutex_unlock(&cd->lock);
> +
> +	scsi_cd_put(cd);
>  }
>  
>  #ifndef CONFIG_COMPAT
>