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"
interacting with commit
ed2ffc74eee8 ("nsfs: Add a show_path method to fix mountinfo")
from the userns tree.
I added this patch:
From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Thu, 25 Jun 2015 17:41:14 +1000
Subject: [PATCH] nsfs: fix for seq_printf() API change
Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au>
---
fs/nsfs.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/nsfs.c b/fs/nsfs.c
index e4905fbf3396..8f20d6016e20 100644
--- a/fs/nsfs.c
+++ b/fs/nsfs.c
@@ -142,7 +142,8 @@ static int nsfs_show_path(struct seq_file *seq, struct
dentry *dentry)
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 = {
--
2.1.4
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpUXnKGtP846.pgp
Description: OpenPGP digital signature
