linux-next: build failure after merge of the ext4 tree

public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Theodore Tso <tytso@MIT•EDU>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Yongqiang Yang <xiaoqiangnk@gmail•com>, Jan Kara <jack@suse•cz>
Subject: linux-next: build failure after merge of the ext4 tree
Date: Tue, 3 Jan 2012 11:35:33 +1100	[thread overview]
Message-ID: <20120103113533.b2fdd68aff5b6d3c100d41b6@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 3213 bytes --]

Hi Ted,

After merging the ext4 tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

fs/jbd2/built-in.o: In function `journal_clear_buffer_revoked_flags':
(.opd+0x5b8): multiple definition of `journal_clear_buffer_revoked_flags'
fs/jbd/built-in.o:(.opd+0x570): first defined here
fs/jbd2/built-in.o: In function `.journal_clear_buffer_revoked_flags':
(.text+0x7e80): multiple definition of `.journal_clear_buffer_revoked_flags'
fs/jbd/built-in.o:(.text+0x7970): first defined here

Caused by commit 7834c98154f1 ("jbd2: clear revoked flag on buffers
before a new transaction started") interacting with commit 8c111b3f5633
("jbd: clear revoked flag on buffers before a new transaction started")
form the ext3 tree.

I applied this merge fix patch:

From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Tue, 3 Jan 2012 11:31:37 +1100
Subject: [PATCH] jbd2: sanitize a new global symbol
 (journal_clear_buffer_revoked_flags)

Fixes these build errors (when combined with the ext3 tree):

fs/jbd2/built-in.o: In function `journal_clear_buffer_revoked_flags':
(.opd+0x5b8): multiple definition of `journal_clear_buffer_revoked_flags'
fs/jbd/built-in.o:(.opd+0x570): first defined here

Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
 fs/jbd2/commit.c     |    2 +-
 fs/jbd2/revoke.c     |    2 +-
 include/linux/jbd2.h |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 7f99e17..3f5c545 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -433,7 +433,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
 	 * Clear revoked flag to reflect there is no revoked buffers
 	 * in the next transaction which is going to be started.
 	 */
-	journal_clear_buffer_revoked_flags(journal);
+	jbd2_journal_clear_buffer_revoked_flags(journal);
 
 	/*
 	 * Switch to a new revoke table.
diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c
index 1c36138..c99d839 100644
--- a/fs/jbd2/revoke.c
+++ b/fs/jbd2/revoke.c
@@ -487,7 +487,7 @@ int jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)
  * revoke table to reflect there is no revoked buffers in the next
  * transaction which is going to be started.
  */
-void journal_clear_buffer_revoked_flags(journal_t *journal)
+void jbd2_journal_clear_buffer_revoked_flags(journal_t *journal)
 {
 	struct jbd2_revoke_table_s *revoke = journal->j_revoke;
 	int i = 0;
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 17bf089..44b8072 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -1151,7 +1151,7 @@ extern int	jbd2_journal_set_revoke(journal_t *, unsigned long long, tid_t);
 extern int	jbd2_journal_test_revoke(journal_t *, unsigned long long, tid_t);
 extern void	jbd2_journal_clear_revoke(journal_t *);
 extern void	jbd2_journal_switch_revoke_table(journal_t *journal);
-extern void	journal_clear_buffer_revoked_flags(journal_t *journal);
+extern void	jbd2_journal_clear_buffer_revoked_flags(journal_t *journal);
 
 /*
  * The log thread user interface:
-- 
1.7.8.197.g73c6b

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

next             reply	other threads:[~2012-01-03  0:35 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-03  0:35 Stephen Rothwell [this message]
2012-01-05 21:06 ` linux-next: build failure after merge of the ext4 tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2012-07-10  1:23 Stephen Rothwell
2012-07-10  1:48 ` Aditya Kali
2013-04-03 23:43 Stephen Rothwell
2013-04-04 13:18 ` Lukáš Czerner
2013-04-04 13:20   ` Theodore Ts'o
2013-04-04 13:27     ` Lukáš Czerner
2013-07-29  1:08 Stephen Rothwell
2013-07-31  1:27 ` Stephen Rothwell
2013-08-07  5:16 ` Sedat Dilek
2013-08-07  5:38   ` Stephen Rothwell
2013-08-07  5:43     ` Sedat Dilek
2013-08-07  5:59       ` Stephen Rothwell
2013-08-07 15:28     ` Kevin Hilman
2013-08-08  0:22       ` Stephen Rothwell
2013-08-08  0:36         ` Stephen Rothwell
2013-08-08 19:16           ` Yann E. MORIN
2013-08-08 21:54             ` Yann E. MORIN
2013-08-08 23:58               ` Stephen Rothwell
2013-08-09 11:42               ` Sam Ravnborg
2013-08-11 21:39                 ` Yann E. MORIN
2013-08-16 13:10                   ` Michal Marek
2013-08-16 17:14                     ` Sam Ravnborg
2013-08-16 18:02                       ` Yann E. MORIN
2015-05-07  1:14 Stephen Rothwell
2015-07-23  0:56 Stephen Rothwell
2015-07-23 16:49 ` Theodore Ts'o
2015-07-23 17:23   ` Theodore Ts'o
2015-07-23 17:41     ` Tejun Heo
2016-01-03 23:34 Stephen Rothwell
2016-01-04 13:49 ` Theodore Ts'o
2016-02-07 23:50 Stephen Rothwell
2018-10-08 23:51 Stephen Rothwell
2018-10-09  5:23 ` Theodore Y. Ts'o
2025-02-13 22:58 Stephen Rothwell
2025-07-14 22:22 Stephen Rothwell
2025-07-15  3:31 ` Zhang Yi
2026-05-29 11:59 Mark Brown
2026-06-01 12:43 ` Mark Brown
2026-06-01 15:17   ` Guan-Chun Wu

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:7f99e17 dfblob:3f5c545 dfblob:1c36138 dfblob:c99d839
dfblob:17bf089 dfblob:44b8072 )
 OR (
bs:"jbd2: sanitize a new global symbol" )
	(help)

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=20120103113533.b2fdd68aff5b6d3c100d41b6@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=jack@suse$(echo .)cz \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=tytso@MIT$(echo .)EDU \
    --cc=xiaoqiangnk@gmail$(echo .)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