From d50669178dca1c3a709ea38acbd1bc1c00d90645 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 28 Jul 2019 09:20:47 +0200 Subject: [PATCH] 5.2-stable patches added patches: btrfs-shut-up-bogus-wmaybe-uninitialized-warning.patch --- ...p-bogus-wmaybe-uninitialized-warning.patch | 41 +++++++++++++++++++ queue-5.2/series | 1 + 2 files changed, 42 insertions(+) create mode 100644 queue-5.2/btrfs-shut-up-bogus-wmaybe-uninitialized-warning.patch diff --git a/queue-5.2/btrfs-shut-up-bogus-wmaybe-uninitialized-warning.patch b/queue-5.2/btrfs-shut-up-bogus-wmaybe-uninitialized-warning.patch new file mode 100644 index 00000000000..34902199e14 --- /dev/null +++ b/queue-5.2/btrfs-shut-up-bogus-wmaybe-uninitialized-warning.patch @@ -0,0 +1,41 @@ +From 6c64460cdc8be5fa074aa8fe2ae8736d5792bdc5 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Mon, 17 Jun 2019 13:07:28 +0200 +Subject: btrfs: shut up bogus -Wmaybe-uninitialized warning + +From: Arnd Bergmann + +commit 6c64460cdc8be5fa074aa8fe2ae8736d5792bdc5 upstream. + +gcc sometimes can't determine whether a variable has been initialized +when both the initialization and the use are conditional: + +fs/btrfs/props.c: In function 'inherit_props': +fs/btrfs/props.c:389:4: error: 'num_bytes' may be used uninitialized in this function [-Werror=maybe-uninitialized] + btrfs_block_rsv_release(fs_info, trans->block_rsv, + +This code is fine. Unfortunately, I cannot think of a good way to +rephrase it in a way that makes gcc understand this, so I add a bogus +initialization the way one should not. + +Signed-off-by: Arnd Bergmann +Reviewed-by: David Sterba +[ gcc 8 and 9 don't emit the warning ] +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman + +--- + fs/btrfs/props.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/btrfs/props.c ++++ b/fs/btrfs/props.c +@@ -337,7 +337,7 @@ static int inherit_props(struct btrfs_tr + for (i = 0; i < ARRAY_SIZE(prop_handlers); i++) { + const struct prop_handler *h = &prop_handlers[i]; + const char *value; +- u64 num_bytes; ++ u64 num_bytes = 0; + + if (!h->inheritable) + continue; diff --git a/queue-5.2/series b/queue-5.2/series index 99e1f2112d0..bfb9ef4b727 100644 --- a/queue-5.2/series +++ b/queue-5.2/series @@ -1,2 +1,3 @@ regulator-88pm800-fix-warning-same-module-names.patch media-drivers-media-coda-fix-warning-same-module-names.patch +btrfs-shut-up-bogus-wmaybe-uninitialized-warning.patch -- 2.47.3