diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-02-22 22:53:20 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-02-23 12:42:46 +0100 |
| commit | f827ba9a641b481f01d1bdc0771a7afc3776cc0b (patch) | |
| tree | 22ec5eb60e8b2210d3458b2565e1189ce8e89acd /fs | |
| parent | 5598e9005a4076d6700bbd89d0cdbe5b2922a846 (diff) | |
| download | linux-f827ba9a641b481f01d1bdc0771a7afc3776cc0b.tar.gz linux-f827ba9a641b481f01d1bdc0771a7afc3776cc0b.tar.bz2 linux-f827ba9a641b481f01d1bdc0771a7afc3776cc0b.zip | |
btrfs: avoid uninitialized variable warning
With CONFIG_SMP and CONFIG_PREEMPT both disabled, gcc decides
to partially inline the get_state_failrec() function but cannot
figure out that means the failrec pointer is always valid
if the function returns success, which causes a harmless
warning:
fs/btrfs/extent_io.c: In function 'clean_io_failure':
fs/btrfs/extent_io.c:2131:4: error: 'failrec' may be used uninitialized in this function [-Werror=maybe-uninitialized]
This marks get_state_failrec() and set_state_failrec() both
as 'noinline', which avoids the warning in all cases for me,
and seems less ugly than adding a fake initialization.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 47dc196ae719 ("btrfs: use proper type for failrec in extent_state")
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/extent_io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 96d24d049797..b3f7bba91ab1 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -1842,7 +1842,7 @@ out: * set the private field for a given byte offset in the tree. If there isn't * an extent_state there already, this does nothing. */ -static int set_state_failrec(struct extent_io_tree *tree, u64 start, +static noinline int set_state_failrec(struct extent_io_tree *tree, u64 start, struct io_failure_record *failrec) { struct rb_node *node; @@ -1870,7 +1870,7 @@ out: return ret; } -static int get_state_failrec(struct extent_io_tree *tree, u64 start, +static noinline int get_state_failrec(struct extent_io_tree *tree, u64 start, struct io_failure_record **failrec) { struct rb_node *node; |