]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
btrfs: tree-checker: use %zu format string for size_t
authorArnd Bergmann <arnd@arndb.de>
Wed, 6 Dec 2017 14:18:14 +0000 (15:18 +0100)
committerSultan Alsawaf <sultan.alsawaf@canonical.com>
Wed, 24 Jul 2019 15:44:56 +0000 (09:44 -0600)
BugLink: https://bugs.launchpad.net/bugs/1836968
commit 7cfad65297bfe0aa2996cd72d21c898aa84436d9 upstream.

The return value of sizeof() is of type size_t, so we must print it
using the %z format modifier rather than %l to avoid this warning
on some architectures:

fs/btrfs/tree-checker.c: In function 'check_dir_item':
fs/btrfs/tree-checker.c:273:50: error: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'u32' {aka 'unsigned int'} [-Werror=format=]

Fixes: 005887f2e3e0 ("btrfs: tree-checker: Add checker for dir item")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
fs/btrfs/tree-checker.c

index 66dac0a4b01f320be925316b46acd18761866258..7c55e3ba5a6c86f70aaa8a2b9d1ac3d469075f78 100644 (file)
@@ -270,7 +270,7 @@ static int check_dir_item(struct btrfs_root *root,
                /* header itself should not cross item boundary */
                if (cur + sizeof(*di) > item_size) {
                        dir_item_err(root, leaf, slot,
-               "dir item header crosses item boundary, have %lu boundary %u",
+               "dir item header crosses item boundary, have %zu boundary %u",
                                cur + sizeof(*di), item_size);
                        return -EUCLEAN;
                }