public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "J. Bruce Fields" <bfields@fieldses•org>,
	David Chinner <david@fromorbit•com>,
	xfs-masters@oss•sgi.com
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Ben Myers <bpm@sgi•com>, Christoph Hellwig <hch@infradead•org>
Subject: linux-next: build failure after merge of the nfsd and xfs trees
Date: Wed, 24 Feb 2010 12:36:46 +1100	[thread overview]
Message-ID: <20100224123646.bb62faea.sfr@canb.auug.org.au> (raw)

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 <sfr@canb•auug.org.au>
Date: Wed, 24 Feb 2010 12:20:01 +1100
Subject: [PATCH] nfsd: fixup for _xfs_log_force API change

Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
 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/

             reply	other threads:[~2010-02-24  1:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-24  1:36 Stephen Rothwell [this message]
2010-02-24  1:58 ` linux-next: build failure after merge of the nfsd and xfs trees Dave Chinner
2010-02-24  2:43   ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100224123646.bb62faea.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=bfields@fieldses$(echo .)org \
    --cc=bpm@sgi$(echo .)com \
    --cc=david@fromorbit$(echo .)com \
    --cc=hch@infradead$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=xfs-masters@oss$(echo .)sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox