ubifs: Fix ino_t format warnings in orphan_delete()
Subsystems (4)
PATCH 1/1 ubifs: Fix ino_t format warnings in orphan_delete()
On alpha and s390x:
fs/ubifs/debug.h:158:11: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 4 has type ‘ino_t {aka unsigned int}’ [-Wformat=]
...
fs/ubifs/orphan.c:132:3: note: in expansion of macro ‘dbg_gen’
dbg_gen("deleted twice ino %lu", orph->inum);
...
fs/ubifs/orphan.c:140:3: note: in expansion of macro ‘dbg_gen’
dbg_gen("delete later ino %lu", orph->inum);__kernel_ino_t is "unsigned long" on most architectures, but not on alpha and s390x, where it is "unsigned int". Hence when printing an ino_t, it should always be cast to "unsigned long" first.
Fix this by re-adding the recently removed casts.
Fixes 8009ce956c3d2802 ("ubifs: Don't leak orphans on memory during commit")
Signed-off-by Geert Uytterhoeven <[email protected]>
--- fs/ubifs/orphan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/ubifs/orphan.c +2 -2
@@ -129,7 +129,7 @@ static void __orphan_drop(struct ubifs_info *c, struct ubifs_orphan *o)static void orphan_delete (struct ubifs_info *c,struct ubifs_orphan *orph) {if (orph->del) { -dbg_gen ("deleted twice ino %lu" , orph->inum); +dbg_gen ("deleted twice ino %lu" , (unsigned long )orph->inum);return ; }
@@ -137,7 +137,7 @@ static void orphan_delete(struct ubifs_info *c, struct ubifs_orphan *orph) orph->del =1 ; orph->dnext = c->orph_dnext; c->orph_dnext = orph; -dbg_gen ("delete later ino %lu" , orph->inum); +dbg_gen ("delete later ino %lu" , (unsigned long )orph->inum);return ; }
Signature · 1 line
2.17.1
Richard Weinberger
AppliedQuoted 15 lines · Geert Uytterhoeven
On alpha and s390x:
fs/ubifs/debug.h:158:11: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 4 has type ‘ino_t {aka unsigned int}’ [-Wformat=] ... fs/ubifs/orphan.c:132:3: note: in expansion of macro ‘dbg_gen’ dbg_gen("deleted twice ino %lu", orph->inum); ... fs/ubifs/orphan.c:140:3: note: in expansion of macro ‘dbg_gen’ dbg_gen("delete later ino %lu", orph->inum);
__kernel_ino_tis "unsigned long" on most architectures, but not on alpha and s390x, where it is "unsigned int". Hence when printing anino_t, it should always be cast to "unsigned long" first.
Quoted 7 lines
Fix this by re-adding the recently removed casts.
Fixes 8009ce956c3d2802 ("ubifs: Don't leak orphans on memory during commit")Signed-off-by Geert Uytterhoeven <[email protected]>--- fs/ubifs/orphan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Applied! Thank you, Geert.
Signature · 2 lines
Thanks, //richard