[GFS2] gfs2_dir_read_data(): fix uninitialized variable usage
authorAdrian Bunk <bunk@stusta.de>
Thu, 19 Oct 2006 14:02:07 +0000 (16:02 +0200)
committerSteven Whitehouse <swhiteho@redhat.com>
Fri, 20 Oct 2006 13:16:20 +0000 (09:16 -0400)
In the "if (extlen)" case, "bh" was used uninitialized.

This patch changes the code to what seems to have been intended.

Spotted by the Coverity checker.

This patch also removes a pointless "bh = NULL" asignment (the variable
is never accessed again after this point).

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
fs/gfs2/dir.c

index ead7df066853b8aecbb497e4a8efbf70d828c5c7..e24af28b1a121e556ce19770682c4c9ae4df5fe1 100644 (file)
@@ -315,8 +315,7 @@ static int gfs2_dir_read_data(struct gfs2_inode *ip, char *buf, u64 offset,
                        if (!ra)
                                extlen = 1;
                        bh = gfs2_meta_ra(ip->i_gl, dblock, extlen);
-               }
-               if (!bh) {
+               } else {
                        error = gfs2_meta_read(ip->i_gl, dblock, DIO_WAIT, &bh);
                        if (error)
                                goto fail;
@@ -330,7 +329,6 @@ static int gfs2_dir_read_data(struct gfs2_inode *ip, char *buf, u64 offset,
                extlen--;
                memcpy(buf, bh->b_data + o, amount);
                brelse(bh);
-               bh = NULL;
                buf += amount;
                copied += amount;
                lblock++;