diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-01-26 13:08:10 -0500 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2017-05-09 08:19:45 +0200 |
| commit | 6e33ef16755a6936b6105868e12712ebdaebd7d0 (patch) | |
| tree | fda06051f0252b901c1041f74d61174924d7d394 | |
| parent | 81e06f6e802e89047ec35f893cc953fbdc63988e (diff) | |
| download | linux-6e33ef16755a6936b6105868e12712ebdaebd7d0.tar.gz linux-6e33ef16755a6936b6105868e12712ebdaebd7d0.tar.bz2 linux-6e33ef16755a6936b6105868e12712ebdaebd7d0.zip | |
gfs2: avoid uninitialized variable warning
commit 67893f12e5374bbcaaffbc6e570acbc2714ea884 upstream.
We get a bogus warning about a potential uninitialized variable
use in gfs2, because the compiler does not figure out that we
never use the leaf number if get_leaf_nr() returns an error:
fs/gfs2/dir.c: In function 'get_first_leaf':
fs/gfs2/dir.c:802:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
fs/gfs2/dir.c: In function 'dir_split_leaf':
fs/gfs2/dir.c:1021:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
Changing the 'if (!error)' to 'if (!IS_ERR_VALUE(error))' is
sufficient to let gcc understand that this is exactly the same
condition as in IS_ERR() so it can optimize the code path enough
to understand it.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | fs/gfs2/dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index 2e5fc268d324..bdef6fef651c 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c @@ -763,7 +763,7 @@ static int get_first_leaf(struct gfs2_inode *dip, u32 index, int error; error = get_leaf_nr(dip, index, &leaf_no); - if (!error) + if (!IS_ERR_VALUE(error)) error = get_leaf(dip, leaf_no, bh_out); return error; @@ -974,7 +974,7 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) index = name->hash >> (32 - dip->i_depth); error = get_leaf_nr(dip, index, &leaf_no); - if (error) + if (IS_ERR_VALUE(error)) return error; /* Get the old leaf block */ |