Messages in this thread Patch in this message | | | Date | Tue, 14 Jul 2015 15:19:08 +1000 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the akpm tree |
| |
Hi Andrew,
After merging the akpm tree, today's linux-next build (arm multi_v7_defconfig) failed like this:
fs/nsfs.c: In function 'nsfs_show_path': fs/nsfs.c:145:2: error: void value not ignored as it ought to be return seq_printf(seq, "%s:[%lu]", ns_ops->name, inode->i_ino); ^ fs/nsfs.c:146:1: warning: control reaches end of non-void function [-Wreturn-type] } ^
Caused by patch
"fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void"
from the akpm tree interacting with commit
75509fd88fbd ("nsfs: Add a show_path method to fix mountinfo")
from the userns tree (which has reappeared).
I have applied the same fix patch from last time:
From: Stephen Rothwell <sfr@canb.auug.org.au> Subject: nsfs: fix for seq_printf() API change Date: Thu, 25 Jun 2015 17:41:14 +1000
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Joe Perches <joe@perches.com> Cc: Al Viro <viro@ZenIV.linux.org.uk> Cc: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> ---
fs/nsfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN fs/nsfs.c~fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix fs/nsfs.c --- a/fs/nsfs.c~fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix +++ a/fs/nsfs.c @@ -142,7 +142,8 @@ static int nsfs_show_path(struct seq_fil struct inode *inode = d_inode(dentry); const struct proc_ns_operations *ns_ops = dentry->d_fsdata; - return seq_printf(seq, "%s:[%lu]", ns_ops->name, inode->i_ino); + seq_printf(seq, "%s:[%lu]", ns_ops->name, inode->i_ino); + return 0; } static const struct super_operations nsfs_ops = { -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |