Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cb308ce authored by Xiaotian Feng's avatar Xiaotian Feng Committed by Tejun Heo
Browse files

block: sysfs fix mismatched queue_var_{store,show} in 64bit kernel 



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

Fix it by using unsigned long.

While at it, convert queue_rq_affinity_show() such that it uses bool
variable instead of explicit != 0 testing.

Signed-off-by: default avatarXiaotian Feng <dfeng@redhat.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 8f474287

block/blk-sysfs.c

+6 −5
Original line number Diff line number Diff line
@@ -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);

}



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);



	return queue_var_show(ra_kb, (page));

}
@@ -189,9 +190,9 @@ static ssize_t queue_nomerges_store(struct request_queue *q, const char *page, 


static ssize_t queue_rq_affinity_show(struct request_queue *q, char *page)

{

	unsigned int set = test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags);

	bool set = test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags);



	return queue_var_show(set != 0, page);

	return queue_var_show(set, page);

}



static ssize_t