projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath10k: store firmware files in memory
[cascardo/linux.git]
/
drivers
/
md
/
dm-mpath.c
diff --git
a/drivers/md/dm-mpath.c
b/drivers/md/dm-mpath.c
index
bdf26f5
..
5adede1
100644
(file)
--- a/
drivers/md/dm-mpath.c
+++ b/
drivers/md/dm-mpath.c
@@
-1561,7
+1561,6
@@
static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,
unsigned long flags;
int r;
unsigned long flags;
int r;
-again:
bdev = NULL;
mode = 0;
r = 0;
bdev = NULL;
mode = 0;
r = 0;
@@
-1579,7
+1578,7
@@
again:
}
if ((pgpath && m->queue_io) || (!pgpath && m->queue_if_no_path))
}
if ((pgpath && m->queue_io) || (!pgpath && m->queue_if_no_path))
- r = -E
AGAI
N;
+ r = -E
NOTCON
N;
else if (!bdev)
r = -EIO;
else if (!bdev)
r = -EIO;
@@
-1591,11
+1590,8
@@
again:
if (!r && ti->len != i_size_read(bdev->bd_inode) >> SECTOR_SHIFT)
r = scsi_verify_blk_ioctl(NULL, cmd);
if (!r && ti->len != i_size_read(bdev->bd_inode) >> SECTOR_SHIFT)
r = scsi_verify_blk_ioctl(NULL, cmd);
- if (r == -E
AGAIN && !fatal_signal_pending(current)) {
+ if (r == -E
NOTCONN && !fatal_signal_pending(current))
queue_work(kmultipathd, &m->process_queued_ios);
queue_work(kmultipathd, &m->process_queued_ios);
- msleep(10);
- goto again;
- }
return r ? : __blkdev_driver_ioctl(bdev, mode, cmd, arg);
}
return r ? : __blkdev_driver_ioctl(bdev, mode, cmd, arg);
}