Skip to contentSkip to conversation

gfs2_dir_read_data(): fix uninitialized variable usage

PATCH New Steven Whitehouse 1 participant 1 message Oct 20, 2006 GFS2 file system

lore
Share & tools
lore
#0 lore raw

PATCH 8/8 gfs2_dir_read_data(): fix uninitialized variable usage

Quoted 1 line

From b7d8ac3e1779c30ddef0a8f38042076c5007a23d Mon Sep 17 00:00:00 2001

From: Adrian Bunk <[email protected]>
Date: Thu, 19 Oct 2006 16:02:07 +0200
Subject: [GFS2] gfs2_dir_read_data(): fix uninitialized variable usage

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).

---
 fs/gfs2/dir.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
fs/gfs2/dir.c +1 -3
index ead7df0..e24af28 100644
@@ -315,8 +315,7 @@ static int gfs2_dir_read_data(struct gfs
 			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 gfs
 		extlen--;
 		memcpy(buf, bh->b_data + o, amount);
 		brelse(bh);
-		bh = NULL;
 		buf += amount;
 		copied += amount;
 		lblock++;
Signature · 1 line
1.4.1