Commit 32870e2b authored Oct 08, 2018 by Tang Junhui Committed by Greg Kroah-Hartman Nov 13, 2018

bcache: fix ioctl in flash device



commit dd0c91793b7c2658ea32c6b3a2247a8ceca45dc0 upstream.

When doing ioctl in flash device, it will call ioctl_dev() in super.c,
then we should not to get cached device since flash only device has
no backend device. This patch just move the jugement dc->io_disable
to cached_dev_ioctl() to make ioctl in flash device correctly.

Fixes: 0f0709e6 ("bcache: stop bcache device when backing device is offline")
Signed-off-by: Tang Junhui <tang.junhui.linux@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Coly Li <colyli@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent fec039ec

drivers/md/bcache/request.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1218,6 +1218,9 @@ static int cached_dev_ioctl(struct bcache_device *d, fmode_t mode,
		{
		struct cached_dev *dc = container_of(d, struct cached_dev, disk);

		if (dc->io_disable)
		return -EIO;

		return __blkdev_driver_ioctl(dc->bdev, mode, cmd, arg);
		}

drivers/md/bcache/super.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -643,10 +643,6 @@ static int ioctl_dev(struct block_device *b, fmode_t mode,
		unsigned int cmd, unsigned long arg)
		{
		struct bcache_device *d = b->bd_disk->private_data;
		struct cached_dev *dc = container_of(d, struct cached_dev, disk);

		if (dc->io_disable)
		return -EIO;

		return d->ioctl(d, mode, cmd, arg);
		}