From 1db1840c11b0428a546b678e95c058965cf3cfb7 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@redhat.com>
Date: Thu, 10 Jan 2013 10:41:48 -0600
Subject: [PATCH] --- yaml --- r: 352916 b: refs/heads/master c:
 d4608632ec8f4ae3ffecdd343ede34e60eabc64f h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/fs/xfs/xfs_dir2_block.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d4af7af9fb52..cc4bb5a39152 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83a9ba00573904953c58565226f1d3bab9f10983
+refs/heads/master: d4608632ec8f4ae3ffecdd343ede34e60eabc64f
diff --git a/trunk/fs/xfs/xfs_dir2_block.c b/trunk/fs/xfs/xfs_dir2_block.c
index 7536faaa61e7..12afe07a91d7 100644
--- a/trunk/fs/xfs/xfs_dir2_block.c
+++ b/trunk/fs/xfs/xfs_dir2_block.c
@@ -355,10 +355,12 @@ xfs_dir2_block_addname(
 	/*
 	 * If need to compact the leaf entries, do it now.
 	 */
-	if (compact)
+	if (compact) {
 		xfs_dir2_block_compact(tp, bp, hdr, btp, blp, &needlog,
 				      &lfloghigh, &lfloglow);
-	else if (btp->stale) {
+		/* recalculate blp post-compaction */
+		blp = xfs_dir2_block_leaf_p(btp);
+	} else if (btp->stale) {
 		/*
 		 * Set leaf logging boundaries to impossible state.
 		 * For the no-stale case they're set explicitly.