From bbdd304cf66fbf2b4b2d28418dc619d443635e83 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 9 May 2011 08:28:13 +0200 Subject: [PATCH] fs: fixup warning part_discard_alignment_show() 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 Signed-off-by: Jens Axboe --- fs/partitions/check.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/partitions/check.c b/fs/partitions/check.c index b7e16bccd5e5..8ed4d3433199 100644 --- 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)); }