]> git.baikalelectronics.ru Git - kernel.git/commit
ubifs: Fix ino_t format warnings in orphan_delete()
authorGeert Uytterhoeven <geert@linux-m68k.org>
Mon, 13 Jan 2020 10:51:56 +0000 (11:51 +0100)
committerRichard Weinberger <richard@nod.at>
Thu, 16 Jan 2020 23:43:22 +0000 (00:43 +0100)
commit52961bfb7465b9520ba5d8e79ee6ed840e2b6b89
treead0773ddadc049256592c85b8e0e983b229391d1
parent57ef1f96248e74ef132ea50a8fddc582644452c0
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: f58ff412d12a612d ("ubifs: Don't leak orphans on memory during commit")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
fs/ubifs/orphan.c