Subject: Re: linux-next: build failure after merge of the xfs tree

From: Dave Chinner <[email-masked]>
Date: Mon, 26 Jul 2010 13:54:42 +1000

On Mon, Jul 26, 2010 at 11:51:07AM +1000, Stephen Rothwell wrote:
> Hi David,
> 
> After merging the xfs tree, today's linux-next build (powerpc ppc64_defconfig)
> failed like this:
> 
> fs/xfs/xfs_inode_item.c: In function 'xfs_inode_item_format':
> fs/xfs/xfs_inode_item.c:319: error: 'nrecs' undeclared (first use in this function)
> 
> Caused by commit 0fd7275cc42ab734eaa1a2c747e65479bd1e42af ("xfs: fix gcc
> 4.6 set but not read and unused statement warnings").

Can you check the following patch fixes the problem?

Cheers,

Dave.
-- 
Dave Chinner
[email-masked]

xfs: fix big endian build

From: Dave Chinner <[email-masked]>

Commit 0fd7275cc42ab734eaa1a2c747e65479bd1e42af ("xfs: fix gcc 4.6
set but not read and unused statement warnings") failed to convert
some code inside XFS_NATIVE_HOST (big endian host code only) and
hence fails to build on such machines. Fix it.

Signed-off-by: Dave Chinner <[email-masked]>
---
 fs/xfs/xfs_inode_item.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 2d6fcfd..016b60d 100644
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -316,7 +316,8 @@ xfs_inode_item_format(
 			ASSERT((ip->i_df.if_bytes /
 				(uint)sizeof(xfs_bmbt_rec_t)) > 0);
 #ifdef XFS_NATIVE_HOST
-			if (nrecs == ip->i_d.di_nextents) {
+			if (ip->i_d.di_nextents == ip->i_df.if_bytes /
+						(uint)sizeof(xfs_bmbt_rec_t)) {
 				/*
 				 * There are no delayed allocation
 				 * extents, so just point to the