fs: fixup warning part_discard_alignment_show()

Jens Axboe · Jens Axboe · commit bbdd304cf66f · 2011-05-09T08:28:13.000+02:00
Stephen reports:

-----

After merging the block tree, today's linux-next build (x86_64
allmodconfig) produced this warning:

fs/partitions/check.c: In function 'part_discard_alignment_show':
fs/partitions/check.c:263: warning: format '%u' expects type 'unsigned int', but argument 3 has type 'long long unsigned int'

Introduced by commit  ("block: Remove extra discard_alignment from
hd_struct")

-----

Fix it up by just removing the cast, we return an int already.

Reported-by: Stephen Rothwell &lt;sfr@canb.auug.org.au&gt;
Signed-off-by: Jens Axboe &lt;jaxboe@fusionio.com&gt;
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
@@ -258,8 +258,7 @@ ssize_t part_discard_alignment_show(struct device *dev,
 	struct gendisk *disk = dev_to_disk(dev);
 
 	return sprintf(buf, "%u\n",
-		       (unsigned long long)queue_limit_discard_alignment(
-							&disk->queue->limits,
+			queue_limit_discard_alignment(&disk->queue->limits,
 							p->start_sect));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -258,8 +258,7 @@ ssize_t part_discard_alignment_show(struct device *dev,`
`258`	`258`	`struct gendisk *disk = dev_to_disk(dev);`
`259`	`259`
`260`	`260`	`return sprintf(buf, "%u\n",`
`261`		`- (unsigned long long)queue_limit_discard_alignment(`
`262`		`- &disk->queue->limits,`
	`261`	`+ queue_limit_discard_alignment(&disk->queue->limits,`
`263`	`262`	`p->start_sect));`
`264`	`263`	`}`
`265`	`264`