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@xxxxxxxxxxxxxxxx>
Date: Tue, 3 Jan 2012 12:38:21 +1100
Subject: [PATCH] fs: make put_super global again
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
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@xxxxxxxxxxxxxxxx
Attachment:
pgpANbgqj5nuF.pgp
Description: PGP signature
