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.
Unified · Split
| @@ -258,8 +258,7 @@ ssize_t part_discard_alignment_show(struct device *dev, · 257 unmodified lines | |||
| 258 | struct gendisk *disk = dev_to_disk(dev); | 258 | struct gendisk *disk = dev_to_disk(dev); |
| 259 | 259 | ||
| 260 | return sprintf(buf, "%u\n", | 260 | return sprintf(buf, "%u\n", |
| 261 | (unsigned long long)queue_limit_discard_alignment( | 261 | queue_limit_discard_alignment(&disk->queue->limits, |
| 262 | &disk->queue->limits, | ||
| 263 | p->start_sect)); | 262 | p->start_sect)); |
| 264 | } | 263 | } |
| 265 | 264 | ||