Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
md
/
dm-delay.c
diff --git
a/kernel/drivers/md/dm-delay.c
b/kernel/drivers/md/dm-delay.c
index
57b6a19
..
b4c356a
100644
(file)
--- a/
kernel/drivers/md/dm-delay.c
+++ b/
kernel/drivers/md/dm-delay.c
@@
-122,6
+122,7
@@
static void flush_expired_bios(struct work_struct *work)
* <device> <offset> <delay> [<write_device> <write_offset> <write_delay>]
*
* With separate write parameters, the first set is only used for reads.
* <device> <offset> <delay> [<write_device> <write_offset> <write_delay>]
*
* With separate write parameters, the first set is only used for reads.
+ * Offsets are specified in sectors.
* Delays are specified in milliseconds.
*/
static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
* Delays are specified in milliseconds.
*/
static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
@@
-129,9
+130,10
@@
static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
struct delay_c *dc;
unsigned long long tmpll;
char dummy;
struct delay_c *dc;
unsigned long long tmpll;
char dummy;
+ int ret;
if (argc != 3 && argc != 6) {
if (argc != 3 && argc != 6) {
- ti->error = "
r
equires exactly 3 or 6 arguments";
+ ti->error = "
R
equires exactly 3 or 6 arguments";
return -EINVAL;
}
return -EINVAL;
}
@@
-143,6
+145,7
@@
static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
dc->reads = dc->writes = 0;
dc->reads = dc->writes = 0;
+ ret = -EINVAL;
if (sscanf(argv[1], "%llu%c", &tmpll, &dummy) != 1) {
ti->error = "Invalid device sector";
goto bad;
if (sscanf(argv[1], "%llu%c", &tmpll, &dummy) != 1) {
ti->error = "Invalid device sector";
goto bad;
@@
-154,12
+157,14
@@
static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
goto bad;
}
goto bad;
}
- if (dm_get_device(ti, argv[0], dm_table_get_mode(ti->table),
- &dc->dev_read)) {
+ ret = dm_get_device(ti, argv[0], dm_table_get_mode(ti->table),
+ &dc->dev_read);
+ if (ret) {
ti->error = "Device lookup failed";
goto bad;
}
ti->error = "Device lookup failed";
goto bad;
}
+ ret = -EINVAL;
dc->dev_write = NULL;
if (argc == 3)
goto out;
dc->dev_write = NULL;
if (argc == 3)
goto out;
@@
-175,13
+180,15
@@
static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
goto bad_dev_read;
}
goto bad_dev_read;
}
- if (dm_get_device(ti, argv[3], dm_table_get_mode(ti->table),
- &dc->dev_write)) {
+ ret = dm_get_device(ti, argv[3], dm_table_get_mode(ti->table),
+ &dc->dev_write);
+ if (ret) {
ti->error = "Write device lookup failed";
goto bad_dev_read;
}
out:
ti->error = "Write device lookup failed";
goto bad_dev_read;
}
out:
+ ret = -EINVAL;
dc->kdelayd_wq = alloc_workqueue("kdelayd", WQ_MEM_RECLAIM, 0);
if (!dc->kdelayd_wq) {
DMERR("Couldn't start kdelayd");
dc->kdelayd_wq = alloc_workqueue("kdelayd", WQ_MEM_RECLAIM, 0);
if (!dc->kdelayd_wq) {
DMERR("Couldn't start kdelayd");
@@
-208,7
+215,7
@@
bad_dev_read:
dm_put_device(ti, dc->dev_read);
bad:
kfree(dc);
dm_put_device(ti, dc->dev_read);
bad:
kfree(dc);
- return
-EINVAL
;
+ return
ret
;
}
static void delay_dtr(struct dm_target *ti)
}
static void delay_dtr(struct dm_target *ti)
@@
-231,7
+238,7
@@
static int delay_bio(struct delay_c *dc, int delay, struct bio *bio)
unsigned long expires = 0;
if (!delay || !atomic_read(&dc->may_delay))
unsigned long expires = 0;
if (!delay || !atomic_read(&dc->may_delay))
- return
1
;
+ return
DM_MAPIO_REMAPPED
;
delayed = dm_per_bio_data(bio, sizeof(struct dm_delay_info));
delayed = dm_per_bio_data(bio, sizeof(struct dm_delay_info));
@@
-251,7
+258,7
@@
static int delay_bio(struct delay_c *dc, int delay, struct bio *bio)
queue_timeout(dc, expires);
queue_timeout(dc, expires);
- return
0
;
+ return
DM_MAPIO_SUBMITTED
;
}
static void delay_presuspend(struct dm_target *ti)
}
static void delay_presuspend(struct dm_target *ti)