From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: build failure after merge of the nfsd and xfs trees Date: Wed, 24 Feb 2010 12:36:46 +1100 Message-ID: <20100224123646.bb62faea.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:33486 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753128Ab0BXBgu (ORCPT ); Tue, 23 Feb 2010 20:36:50 -0500 Sender: linux-next-owner@vger.kernel.org List-ID: To: "J. Bruce Fields" , David Chinner , xfs-masters@oss.sgi.com Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ben Myers , Christoph Hellwig Hi Bruce, David, After merging the nfsd and xfs trees, today's linux-next build (powerpc ppc64_defconfig) failed like this: fs/xfs/linux-2.6/xfs_export.c: In function 'xfs_fs_nfs_commit_metadata': fs/xfs/linux-2.6/xfs_export.c:230: error: 'XFS_LOG_FORCE' undeclared (first use in this function) fs/xfs/linux-2.6/xfs_export.c:230: error: too many arguments to function '_xfs_log_force' Caused by commit 978ebd97d1426d5708d3f353179ab81f191a7eeb ("xfs_export_operations.commit_metadata") from the nfsd tree interacting with commit a14a348bff2f99471a28e5928eb6801224c053d8 ("xfs: cleanup up xfs_log_force calling conventions") from the xfs tree. I applied the following patch (which may not be correct) for today (and can keep it as a merge fixup as necessary): From: Stephen Rothwell Date: Wed, 24 Feb 2010 12:20:01 +1100 Subject: [PATCH] nfsd: fixup for _xfs_log_force API change Signed-off-by: Stephen Rothwell --- fs/xfs/linux-2.6/xfs_export.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/xfs/linux-2.6/xfs_export.c b/fs/xfs/linux-2.6/xfs_export.c index 8f4d707..846b75a 100644 --- a/fs/xfs/linux-2.6/xfs_export.c +++ b/fs/xfs/linux-2.6/xfs_export.c @@ -226,8 +226,8 @@ xfs_fs_nfs_commit_metadata( xfs_ilock(ip, XFS_ILOCK_SHARED); if (xfs_ipincount(ip)) { - error = _xfs_log_force(mp, ip->i_itemp->ili_last_lsn, - XFS_LOG_FORCE | XFS_LOG_SYNC, NULL); + error = _xfs_log_force_lsn(mp, ip->i_itemp->ili_last_lsn, + XFS_LOG_SYNC, NULL); } xfs_iunlock(ip, XFS_ILOCK_SHARED); -- 1.7.0 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/