Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1989b33 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Mike Snitzer
Browse files

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: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org
parent 1acacc07

drivers/md/dm-mpath.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -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.

	 * Only pass ioctls through if the device sizes match exactly.

	 */

	 */

	if (!r && ti->len != i_size_read(bdev->bd_inode) >> SECTOR_SHIFT)

	if (!bdev || ti->len != i_size_read(bdev->bd_inode) >> SECTOR_SHIFT) {

		r = scsi_verify_blk_ioctl(NULL, cmd);

		int err = scsi_verify_blk_ioctl(NULL, cmd);

		if (err)

			r = err;

	}





	if (r == -ENOTCONN && !fatal_signal_pending(current))

	if (r == -ENOTCONN && !fatal_signal_pending(current))

		queue_work(kmultipathd, &m->process_queued_ios);

		queue_work(kmultipathd, &m->process_queued_ios);