]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
xfs: Fix uninitialized return value in xfs_alloc_fix_freelist()
authorJan Kara <jack@suse.com>
Tue, 25 Aug 2015 00:05:13 +0000 (10:05 +1000)
committerDave Chinner <david@fromorbit.com>
Tue, 25 Aug 2015 00:05:13 +0000 (10:05 +1000)
xfs_alloc_fix_freelist() can sometimes jump to out_agbp_relse
without ever setting value of 'error' variable which is then
returned. This can happen e.g. when pag->pagf_init is set but AG is
for metadata and we want to allocate user data.

Fix the problem by initializing 'error' to 0, which is the desired
return value when we decide to skip this group.

CC: xfs@oss.sgi.com
Coverity-id: 1309714
Signed-off-by: Jan Kara <jack@suse.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
fs/xfs/libxfs/xfs_alloc.c

index b7fc17ce8233a21c61e4a0f7dddd7c664e06fa43..ffad7f20342f6e328b8daafa918ffeb1ae076ab1 100644 (file)
@@ -1937,7 +1937,7 @@ xfs_alloc_fix_freelist(
        struct xfs_alloc_arg    targs;  /* local allocation arguments */
        xfs_agblock_t           bno;    /* freelist block */
        xfs_extlen_t            need;   /* total blocks needed in freelist */
-       int                     error;
+       int                     error = 0;
 
        if (!pag->pagf_init) {
                error = xfs_alloc_read_agf(mp, tp, args->agno, flags, &agbp);