From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Chinner <david@fromorbit.com>, xfs-masters@oss.sgi.com
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alex Elder <aelder@sgi.com>
Subject: linux-next: build failure after merge of the xfs tree
Date: Fri, 8 Oct 2010 11:08:28 +1100 [thread overview]
Message-ID: <20101008110828.1380e307.sfr@canb.auug.org.au> (raw)
Hi all,
[I tried to cc this to Johannes Weiner <hannes@cmpxchg.org>, but that
domain does not current resolve :-(]
After merging the xfs tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/xfs/linux-2.6/xfs_sync.c:671: error: redefinition of '__xfs_inode_clear_reclaim_tag'
fs/xfs/linux-2.6/xfs_sync.c:623: note: previous definition of '__xfs_inode_clear_reclaim_tag' was here
Caused by a mismerge between commit
081003fff467ea0e727f66d5d435b4f473a789b3 ("xfs: properly account for
reclaimed inodes") from Linus' tree and commit
5ae4ef8313c85f443202aa04405fe178e6138a6a ("xfs: properly account for
reclaimed inodes") from the xfs tree. The new function __xfs_inode_clear_reclaim_tag() was inserted in different places in each of those commits, so git inserted them both.
I applied the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 8 Oct 2010 11:00:58 +1100
Subject: [PATCH] xfs: fix up mismerge of __xfs_inode_clear_reclaim_tag
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/xfs/linux-2.6/xfs_sync.c | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/fs/xfs/linux-2.6/xfs_sync.c b/fs/xfs/linux-2.6/xfs_sync.c
index 574fb71..37d3325 100644
--- a/fs/xfs/linux-2.6/xfs_sync.c
+++ b/fs/xfs/linux-2.6/xfs_sync.c
@@ -667,17 +667,6 @@ xfs_reclaim_inode_grab(
return 0;
}
-void
-__xfs_inode_clear_reclaim_tag(
- xfs_mount_t *mp,
- xfs_perag_t *pag,
- xfs_inode_t *ip)
-{
- radix_tree_tag_clear(&pag->pag_ici_root,
- XFS_INO_TO_AGINO(mp, ip->i_ino), XFS_ICI_RECLAIM_TAG);
- __xfs_inode_clear_reclaim(pag, ip);
-}
-
/*
* Inodes in different states need to be treated differently, and the return
* value of xfs_iflush is not sufficient to get this right. The following table
--
1.7.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
next reply other threads:[~2010-10-08 0:08 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-08 0:08 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-07-07 0:27 linux-next: build failure after merge of the xfs tree Stephen Rothwell
2019-10-28 23:11 Stephen Rothwell
2019-10-28 23:18 ` Darrick J. Wong
2019-10-29 5:56 ` Christoph Hellwig
2019-10-29 6:23 ` Stephen Rothwell
2019-10-29 6:32 ` Christoph Hellwig
2019-07-01 1:12 Stephen Rothwell
2016-02-09 0:17 Stephen Rothwell
2016-02-09 0:30 ` Eric Sandeen
2016-02-09 0:41 ` Stephen Rothwell
2015-04-20 2:35 Stephen Rothwell
2013-04-29 1:29 Stephen Rothwell
2013-04-29 1:40 ` Dave Chinner
2013-04-30 18:36 ` Ben Myers
2012-05-10 3:01 Stephen Rothwell
2012-05-10 18:32 ` Ben Myers
2012-05-10 18:36 ` Mark Tinguely
2012-05-10 18:43 ` Ben Myers
2010-07-26 1:51 Stephen Rothwell
2010-07-26 3:54 ` Dave Chinner
2010-07-26 4:28 ` 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=20101008110828.1380e307.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=aelder@sgi.com \
--cc=david@fromorbit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=xfs-masters@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).