diff options
| author | Tang Junhui <tang.junhui.linux@gmail.com> | 2018-10-08 20:41:10 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-10-08 08:19:42 -0600 |
| commit | dd0c91793b7c2658ea32c6b3a2247a8ceca45dc0 (patch) | |
| tree | 110f5bd2d12063e627654cbbd2aa24b2e94e2a42 /drivers/md/bcache | |
| parent | 752f66a75abad2ae40b4570b3c77b422389cffcf (diff) | |
| download | talos-op-linux-dd0c91793b7c2658ea32c6b3a2247a8ceca45dc0.tar.gz talos-op-linux-dd0c91793b7c2658ea32c6b3a2247a8ceca45dc0.zip | |
bcache: fix ioctl in flash device
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: 0f0709e6bfc3c ("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>
Diffstat (limited to 'drivers/md/bcache')
| -rw-r--r-- | drivers/md/bcache/request.c | 3 | ||||
| -rw-r--r-- | drivers/md/bcache/super.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index ee15fb039fd0..3bf35914bb57 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -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); } diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index 5fd1466b34e4..9de6695195bf 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -648,10 +648,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); } |
