linux-kernel - linux-next: build failure after merge of the vfs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120103124331.f0f0043f8ca464c9ff13f4d3@canb.auug.org.au>
Date:	Tue, 3 Jan 2012 12:43:31 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mikulas Patocka <mpatocka@...hat.com>, Jan Kara <jack@...e.cz>
Subject: linux-next: build failure after merge of the vfs tree

Hi Al,

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

fs/super.c:230:13: error: static declaration of 'put_super' follows non-static declaration
include/linux/fs.h:2493:13: note: previous declaration of 'put_super' was here

Caused by commit eab99e355c00 ("trim fs/internal.h") interacting with
commit 4789fd4495a4 ("quota: Fix deadlock with suspend and quotas") from
the ext3 tree.

I applied the following (probably not the best) merge fix patch for today:

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Tue, 3 Jan 2012 12:38:21 +1100
Subject: [PATCH] fs: make put_super global again

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 fs/super.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/super.c b/fs/super.c
index 3682e6c..cb6d718 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -227,7 +227,7 @@ static void __put_super(struct super_block *sb)
  *	Drops a temporary reference, frees superblock if there's no
  *	references left.
  */
-static void put_super(struct super_block *sb)
+void put_super(struct super_block *sb)
 {
 	spin_lock(&sb_lock);
 	__put_super(sb);
-- 
1.7.8.197.g73c6b

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped