diff options
| author | Hannes Reinecke <hare@suse.de> | 2014-02-26 10:07:04 +0100 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2014-02-26 09:44:44 -0500 |
| commit | a1989b330093578ea5470bea0a00f940c444c466 (patch) | |
| tree | 496a4244b6886198f56f1af84fbfd7a9c6714d6b /drivers/md/dm-mpath.c | |
| parent | 1acacc0784aab45627b6009e0e9224886279ac0b (diff) | |
| download | op-kernel-dev-a1989b330093578ea5470bea0a00f940c444c466.zip op-kernel-dev-a1989b330093578ea5470bea0a00f940c444c466.tar.gz | |
dm mpath: fix stalls when handling invalid ioctls
An invalid ioctl will never be valid, irrespective of whether multipath
has active paths or not. So for invalid ioctls we do not have to wait
for multipath to activate any paths, but can rather return an error
code immediately. This fix resolves numerous instances of:
udevd[]: worker [] unexpectedly returned with status 0x0100
that have been seen during testing.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/md/dm-mpath.c')
| -rw-r--r-- | drivers/md/dm-mpath.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index 6eb9dc9..422a9fde 100644 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c @@ -1626,8 +1626,11 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd, /* * Only pass ioctls through if the device sizes match exactly. */ - if (!r && ti->len != i_size_read(bdev->bd_inode) >> SECTOR_SHIFT) - r = scsi_verify_blk_ioctl(NULL, cmd); + if (!bdev || ti->len != i_size_read(bdev->bd_inode) >> SECTOR_SHIFT) { + int err = scsi_verify_blk_ioctl(NULL, cmd); + if (err) + r = err; + } if (r == -ENOTCONN && !fatal_signal_pending(current)) queue_work(kmultipathd, &m->process_queued_ios); |
