From a130e40513e5248b4397359844d298c61208a20a Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Thu, 19 Oct 2006 16:02:07 +0200
Subject: [PATCH] --- yaml --- r: 40072 b: refs/heads/master c:
 b7d8ac3e1779c30ddef0a8f38042076c5007a23d h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/fs/gfs2/dir.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 04f37b038b08..ea29caded8d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbbe4512735eb0f15f09ffd14876091a8e91bc69
+refs/heads/master: b7d8ac3e1779c30ddef0a8f38042076c5007a23d
diff --git a/trunk/fs/gfs2/dir.c b/trunk/fs/gfs2/dir.c
index ead7df066853..e24af28b1a12 100644
--- a/trunk/fs/gfs2/dir.c
+++ b/trunk/fs/gfs2/dir.c
@@ -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++;