arm64: dts: rk3399-sapphire: enable isp0 isp1

[firefly-linux-kernel-4.4.55.git] / fs / proc_namespace.c

diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 87645955990d15a9df03df7b0c4b4b82100f1543..961e597acfc6633b5f4fa32d0366664092b5dbb5 100644 (file)
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -118,7 +118,9 @@ static int show_vfsmnt(struct seq_file *m, struct vfsmount *mnt)
        if (err)
                goto out;
        show_mnt_opts(m, mnt);
-       if (sb->s_op->show_options)
+       if (sb->s_op->show_options2)
+                       err = sb->s_op->show_options2(mnt, m, mnt_path.dentry);
+       else if (sb->s_op->show_options)
                err = sb->s_op->show_options(m, mnt_path.dentry);
        seq_puts(m, " 0 0\n");
 out:
@@ -178,7 +180,9 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)
        err = show_sb_opts(m, sb);
        if (err)
                goto out;
-       if (sb->s_op->show_options)
+       if (sb->s_op->show_options2) {
+               err = sb->s_op->show_options2(mnt, m, mnt->mnt_root);
+       } else if (sb->s_op->show_options)
                err = sb->s_op->show_options(m, mnt->mnt_root);
        seq_putc(m, '\n');
 out: