Skip to content

Commit d39cb4a

Browse files
arndbgregkh
authored andcommitted
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9a35bc2 commit d39cb4a

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

fs/gfs2/dir.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ static int get_first_leaf(struct gfs2_inode *dip, u32 index,
760760
int error;
761761

762762
error = get_leaf_nr(dip, index, &leaf_no);
763-
if (!error)
763+
if (!IS_ERR_VALUE(error))
764764
error = get_leaf(dip, leaf_no, bh_out);
765765

766766
return error;
@@ -976,7 +976,7 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name)
976976

977977
index = name->hash >> (32 - dip->i_depth);
978978
error = get_leaf_nr(dip, index, &leaf_no);
979-
if (error)
979+
if (IS_ERR_VALUE(error))
980980
return error;
981981

982982
/* Get the old leaf block */

0 commit comments

Comments
 (0)