From: Yingping Lu <yingping@sgi.com>
Date: Wed, 2 Nov 2005 23:31:47 +0000 (+1100)
Subject: [XFS] Fixed the inconsistency between attribute b-tree intermidiate node
X-Git-Tag: v2.6.15-rc1~450^2~2^2~9
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bf6f05aa0bb6f1fe9a9ce35287678c3916bddfef;p=linux-2.6-omap-h63xx.git

[XFS] Fixed the inconsistency between attribute b-tree intermidiate node
and leaf blocks. The problem cam from xfsqa test 117.

SGI-PV: 940655
SGI-Modid: xfs-linux:xfs-kern:201527a

Signed-off-by: Yingping Lu <yingping@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
---

diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
index 6098aff7bd5..473671fa5c1 100644
--- a/fs/xfs/xfs_da_btree.c
+++ b/fs/xfs/xfs_da_btree.c
@@ -429,7 +429,8 @@ xfs_da_node_split(xfs_da_state_t *state, xfs_da_state_blk_t *oldblk,
 	/*
 	 * With V2 the extra block is data or freespace.
 	 */
-	useextra = state->extravalid && XFS_DIR_IS_V1(state->mp);
+	useextra = state->extravalid && (XFS_DIR_IS_V1(state->mp) ||
+			state->args->whichfork == XFS_ATTR_FORK);
 	newcount = 1 + useextra;
 	/*
 	 * Do we have to split the node?