projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged
[platform/kernel/linux-starfive.git]
/
drivers
/
md
/
dm-delay.c
diff --git
a/drivers/md/dm-delay.c
b/drivers/md/dm-delay.c
index
f18375d
..
2dc22dd
100644
(file)
--- a/
drivers/md/dm-delay.c
+++ b/
drivers/md/dm-delay.c
@@
-131,6
+131,7
@@
static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
{
struct delay_c *dc;
unsigned long long tmpll;
{
struct delay_c *dc;
unsigned long long tmpll;
+ char dummy;
if (argc != 3 && argc != 6) {
ti->error = "requires exactly 3 or 6 arguments";
if (argc != 3 && argc != 6) {
ti->error = "requires exactly 3 or 6 arguments";
@@
-145,13
+146,13
@@
static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
dc->reads = dc->writes = 0;
dc->reads = dc->writes = 0;
- if (sscanf(argv[1], "%llu
", &tmpll
) != 1) {
+ if (sscanf(argv[1], "%llu
%c", &tmpll, &dummy
) != 1) {
ti->error = "Invalid device sector";
goto bad;
}
dc->start_read = tmpll;
ti->error = "Invalid device sector";
goto bad;
}
dc->start_read = tmpll;
- if (sscanf(argv[2], "%u
", &dc->read_dela
y) != 1) {
+ if (sscanf(argv[2], "%u
%c", &dc->read_delay, &dumm
y) != 1) {
ti->error = "Invalid delay";
goto bad;
}
ti->error = "Invalid delay";
goto bad;
}
@@
-166,13
+167,13
@@
static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
if (argc == 3)
goto out;
if (argc == 3)
goto out;
- if (sscanf(argv[4], "%llu
", &tmpll
) != 1) {
+ if (sscanf(argv[4], "%llu
%c", &tmpll, &dummy
) != 1) {
ti->error = "Invalid write device sector";
goto bad_dev_read;
}
dc->start_write = tmpll;
ti->error = "Invalid write device sector";
goto bad_dev_read;
}
dc->start_write = tmpll;
- if (sscanf(argv[5], "%u
", &dc->write_dela
y) != 1) {
+ if (sscanf(argv[5], "%u
%c", &dc->write_delay, &dumm
y) != 1) {
ti->error = "Invalid write delay";
goto bad_dev_read;
}
ti->error = "Invalid write delay";
goto bad_dev_read;
}