]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
pstore/blk: Use "%lu" to format unsigned long
authorGeert Uytterhoeven <geert@linux-m68k.org>
Thu, 18 Nov 2021 18:26:21 +0000 (10:26 -0800)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 4 Jan 2022 08:48:51 +0000 (09:48 +0100)
BugLink: https://bugs.launchpad.net/bugs/1952579
commit 61eb495c83bf6ebde490992bf888ca15b9babc39 upstream.

On 32-bit:

    fs/pstore/blk.c: In function ‘__best_effort_init’:
    include/linux/kern_levels.h:5:18: warning: format ‘%zu’ expects argument of type ‘size_t’, but argument 3 has type ‘long unsigned int’ [-Wformat=]
5 | #define KERN_SOH "\001"  /* ASCII Start Of Header */
  |                  ^~~~~~
    include/linux/kern_levels.h:14:19: note: in expansion of macro ‘KERN_SOH’
       14 | #define KERN_INFO KERN_SOH "6" /* informational */
  |                   ^~~~~~~~
    include/linux/printk.h:373:9: note: in expansion of macro ‘KERN_INFO’
      373 |  printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
  |         ^~~~~~~~~
    fs/pstore/blk.c:314:3: note: in expansion of macro ‘pr_info’
      314 |   pr_info("attached %s (%zu) (no dedicated panic_write!)\n",
  |   ^~~~~~~

Cc: stable@vger.kernel.org
Fixes: 7bb9557b48fcabaa ("pstore/blk: Use the normal block device I/O path")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20210629103700.1935012-1-geert@linux-m68k.org
Cc: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
fs/pstore/blk.c

index 04ce58c939a0ba156dd73c4a259b108552e8cd76..6093088de49fd161fe226fa8fe98a48f946f36fc 100644 (file)
@@ -311,7 +311,7 @@ static int __init __best_effort_init(void)
        if (ret)
                kfree(best_effort_dev);
        else
-               pr_info("attached %s (%zu) (no dedicated panic_write!)\n",
+               pr_info("attached %s (%lu) (no dedicated panic_write!)\n",
                        blkdev, best_effort_dev->zone.total_size);
 
        return ret;