Re: [PATCH] block: sysfs fix mismatched queue_var_{store,show} in 64bit kernel

From: AmÃrico Wang
Date: Tue Jul 14 2009 - 09:53:55 EST


On Tue, Jul 14, 2009 at 7:56 PM, Xiaotian Feng<dfeng@xxxxxxxxxx> wrote:
> In blk-sysfs.c, queue_var_store uses unsigned long to store data,
> but queue_var_show uses unsigned int to show data. This causes,
>
> Â Â Â Â# echo 70000000000 > /sys/block/<dev>/queue/read_ahead_kb
> Â Â Â Â# cat /sys/block/<dev>/queue/read_ahead_kb => get wrong value
>
> Signed-off-by: Xiaotian Feng <dfeng@xxxxxxxxxx>
> ---
> Âblock/blk-sysfs.c | Â 13 +++++++------
> Â1 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
> index b1cd040..e177eb3 100644
> --- a/block/blk-sysfs.c
> +++ b/block/blk-sysfs.c
> @@ -16,9 +16,9 @@ struct queue_sysfs_entry {
> Â};
>
> Âstatic ssize_t
> -queue_var_show(unsigned int var, char *page)
> +queue_var_show(unsigned long var, char *page)
> Â{
> - Â Â Â return sprintf(page, "%d\n", var);
> + Â Â Â return sprintf(page, "lu\n", var);


%lu

> Â}
>
> Âstatic ssize_t
> @@ -77,7 +77,8 @@ queue_requests_store(struct request_queue *q, const char *page, size_t count)
>
> Âstatic ssize_t queue_ra_show(struct request_queue *q, char *page)
> Â{
> - Â Â Â int ra_kb = q->backing_dev_info.ra_pages << (PAGE_CACHE_SHIFT - 10);
> + Â Â Â unsigned long ra_kb = q->backing_dev_info.ra_pages <<
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (PAGE_CACHE_SHIFT - 10);


It looks like that your email client replaces tab's with spaces.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/