kernfs: kernfs_sop_show_path: don't return 0 after seq_dentry call
authorSerge E. Hallyn <serge.hallyn@ubuntu.com>
Thu, 12 May 2016 05:29:45 +0000 (00:29 -0500)
committerTejun Heo <tj@kernel.org>
Thu, 12 May 2016 15:03:51 +0000 (11:03 -0400)
Our caller expects 0 on success, not >0.

This fixes a bug in the patch

cgroup, kernfs: make mountinfo show properly scoped path for cgroup namespaces

where /sys does not show up in mountinfo, breaking criu.

Thanks for catching this, Andrei.

Reported-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
fs/kernfs/mount.c

index 3b78724c1979c534e01803f7b34aa615e5f03077..3d670a3678f2dd6dc24dc9db23ca9cd5a63ab0ed 100644 (file)
@@ -50,7 +50,8 @@ static int kernfs_sop_show_path(struct seq_file *sf, struct dentry *dentry)
        if (scops && scops->show_path)
                return scops->show_path(sf, node, root);
 
-       return seq_dentry(sf, dentry, " \t\n\\");
+       seq_dentry(sf, dentry, " \t\n\\");
+       return 0;
 }
 
 const struct super_operations kernfs_sops = {