Subject: linux-next: build failure after merge of the final tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 9 Nov 2010 15:03:02 +1100

Hi Al,

After merging the scsi-post-merge tree, today's linux-next build (sparc32
defconfig) failed like this:

fs/openpromfs/inode.c: In function 'openprom_mount':
fs/openpromfs/inode.c:422: error: expected ';' before '}' token

Caused by commit fc14f2fef682df677d64a145256dbd263df2aa7b ("convert
get_sb_single() users") from Linus' tree.   Pity that conmmit never made
it into the linux-next tree :-(

I added this patch for today:

From: Stephen Rothwell <[email-masked]>
Date: Tue, 9 Nov 2010 14:58:55 +1100
Subject: [PATCH] openpromfs: fix for bad get_sb_single() conversion

Fixes:

fs/openpromfs/inode.c: In function 'openprom_mount':
fs/openpromfs/inode.c:422: error: expected ';' before '}' token

on sparc.

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 fs/openpromfs/inode.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c
index ddb1f41..911e61f 100644
--- a/fs/openpromfs/inode.c
+++ b/fs/openpromfs/inode.c
@@ -418,7 +418,7 @@ out_no_root:
 static struct dentry *openprom_mount(struct file_system_type *fs_type,
 	int flags, const char *dev_name, void *data)
 {
-	return mount_single(fs_type, flags, data, openprom_fill_super)
+	return mount_single(fs_type, flags, data, openprom_fill_super);
 }
 
 static struct file_system_type openprom_fs_type = {
-- 
1.7.2.3

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/