Commit f359e87f authored Apr 11, 2018 by Finn Thain Committed by Greg Kroah-Hartman Apr 29, 2018

block/swim: Remove extra put_disk() call from error path



commit c1d6207cc0eef2a7f8551f9c7420d8776268f6e1 upstream.

Cc: Laurent Vivier <lvivier@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: stable@vger.kernel.org # v4.14+
Fixes: 103db8b2 ("[PATCH] swim: stop sharing request queue across multiple gendisks")
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent b7100feb

drivers/block/swim.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -858,7 +858,6 @@ static int swim_floppy_init(struct swim_priv *swd)
	&swd->lock);		&swd->lock);
	if (!swd->unit[drive].disk->queue) {		if (!swd->unit[drive].disk->queue) {
	err = -ENOMEM;		err = -ENOMEM;
	put_disk(swd->unit[drive].disk);
	goto exit_put_disks;		goto exit_put_disks;
	}		}
	blk_queue_bounce_limit(swd->unit[drive].disk->queue,		blk_queue_bounce_limit(swd->unit[drive].disk->queue,