]> Pileus Git - ~andy/linux/commitdiff
fs: fixup warning part_discard_alignment_show()
authorJens Axboe <jaxboe@fusionio.com>
Mon, 9 May 2011 06:28:13 +0000 (08:28 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Mon, 9 May 2011 06:28:13 +0000 (08:28 +0200)
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 <sfr@canb.auug.org.au>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
fs/partitions/check.c

index b7e16bccd5e53d494902c85a2f8d795ae1b1f403..8ed4d3433199fb233913c3f2e6e88afc149c062c 100644 (file)
@@ -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));
 }