aboutsummaryrefslogtreecommitdiffstats
path: root/fs/partitions
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-05-09 08:28:13 +0200
committerJens Axboe <jaxboe@fusionio.com>2011-05-09 08:28:13 +0200
commitbbdd304cf66fbf2b4b2d28418dc619d443635e83 (patch)
treec0740b29423b04a5d675539d5d841139b538c30a /fs/partitions
parent23ceb5b7719e9276d4fa72a3ecf94dd396755276 (diff)
downloadkernel_samsung_smdk4412-bbdd304cf66fbf2b4b2d28418dc619d443635e83.tar.gz
kernel_samsung_smdk4412-bbdd304cf66fbf2b4b2d28418dc619d443635e83.tar.bz2
kernel_samsung_smdk4412-bbdd304cf66fbf2b4b2d28418dc619d443635e83.zip
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 <sfr@canb.auug.org.au> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs/partitions')
-rw-r--r--fs/partitions/check.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index b7e16bccd5e..8ed4d343319 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));
}