From 9ea202d620d36c9c28677887d606ba4ca40107b3 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Wed, 12 Apr 2006 17:39:45 -0400
Subject: [PATCH] --- yaml --- r: 38652 b: refs/heads/master c:
 4d8012b60e0f0e0217e65f67da7d97276d1824e9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c3416977926f..4b315682f803 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4154ea039bbf45c52840b30c68143a2dc28d4b4
+refs/heads/master: 4d8012b60e0f0e0217e65f67da7d97276d1824e9
diff --git a/trunk/fs/gfs2/dir.c b/trunk/fs/gfs2/dir.c
index 01f89c727cc8..fe6c5adc5df0 100644
--- a/trunk/fs/gfs2/dir.c
+++ b/trunk/fs/gfs2/dir.c
@@ -1511,7 +1511,7 @@ static int dir_new_leaf(struct inode *inode, const struct qstr *name)
 		brelse(obh);
 		return -ENOSPC;
 	}
-	oleaf->lf_next = cpu_to_be64(bn);
+	oleaf->lf_next = cpu_to_be64(bh->b_blocknr);
 	brelse(bh);
 	brelse(obh);
 
@@ -1950,8 +1950,7 @@ int gfs2_dir_exhash_dealloc(struct gfs2_inode *dip)
  * Returns: 1 if alloc required, 0 if not, -ve on error
  */
 
-int gfs2_diradd_alloc_required(struct inode *inode,
-			       const struct qstr *name)
+int gfs2_diradd_alloc_required(struct inode *inode, const struct qstr *name)
 {
 	struct gfs2_dirent *dent;
 	struct buffer_head *bh;