diff options
| author |   Jens Axboe <axboe@suse.de> | 2005-07-27 11:43:37 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 16:25:50 -0700 |
| commit | c9b3ad673460fc997a652cd58aa3a345d40e5218 (patch) | |
| tree | a91d0f452ccfe72fb2cb4c2db75cddc36a2ef21d /drivers/block/as-iosched.c | |
| parent | [PATCH] Fix missing refrigerator invocation in jffs2 (diff) | |
| download | linux-dev-c9b3ad673460fc997a652cd58aa3a345d40e5218.tar.xz linux-dev-c9b3ad673460fc997a652cd58aa3a345d40e5218.zip | |
[PATCH] as-iosched tunable encoding fix
AS is doing internal msec<->jiffies conversions twice, so the sysfs tunables
which represent time are coming out wrong. The switch from HZ=1000 exposed
this.
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block/as-iosched.c')
| -rw-r--r-- | drivers/block/as-iosched.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/block/as-iosched.c b/drivers/block/as-iosched.c index 91aeb678135d..95c0a3690b0f 100644 --- a/drivers/block/as-iosched.c +++ b/drivers/block/as-iosched.c @@ -1935,23 +1935,15 @@ struct as_fs_entry { static ssize_t as_var_show(unsigned int var, char *page) { - var = (var * 1000) / HZ; return sprintf(page, "%d\n", var); } static ssize_t as_var_store(unsigned long *var, const char *page, size_t count) { - unsigned long tmp; char *p = (char *) page; - tmp = simple_strtoul(p, &p, 10); - if (tmp != 0) { - tmp = (tmp * HZ) / 1000; - if (tmp == 0) - tmp = 1; - } - *var = tmp; + *var = simple_strtoul(p, &p, 10); return count; } |