From 3663c286ac1dbbfab53c2b082b90b515348b7386 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 7 Aug 2020 10:00:27 -0700 Subject: [PATCH] Revert "ANDROID: Add show_options2 to view private mount data" This reverts commit e2b3aa25c512b94b755d93de23bec7af81d4b7d9 (change I2d1c06fae274eeac03ac1924ef162f7bbb2f29d0). This is no longer needed because the only user of show_options2 was sdcardfs, and sdcardfs has now been removed. Bug: 157700134 Change-Id: I740a75f8e34b6119d71905b6787d4955a7aad1bf Signed-off-by: Eric Biggers Signed-off-by: Greg Kroah-Hartman --- fs/proc_namespace.c | 8 ++------ include/linux/fs.h | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c index f3878785aff1..3059a9394c2d 100644 --- a/fs/proc_namespace.c +++ b/fs/proc_namespace.c @@ -121,9 +121,7 @@ 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_options2) - err = sb->s_op->show_options2(mnt, m, mnt_path.dentry); - else if (sb->s_op->show_options) + if (sb->s_op->show_options) err = sb->s_op->show_options(m, mnt_path.dentry); seq_puts(m, " 0 0\n"); out: @@ -185,9 +183,7 @@ 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_options2) { - err = sb->s_op->show_options2(mnt, m, mnt->mnt_root); - } else if (sb->s_op->show_options) + if (sb->s_op->show_options) err = sb->s_op->show_options(m, mnt->mnt_root); seq_putc(m, '\n'); out: diff --git a/include/linux/fs.h b/include/linux/fs.h index 5f2162211ec4..5dfd7efadb28 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1937,7 +1937,6 @@ struct super_operations { void (*umount_begin) (struct super_block *); int (*show_options)(struct seq_file *, struct dentry *); - int (*show_options2)(struct vfsmount *,struct seq_file *, struct dentry *); int (*show_devname)(struct seq_file *, struct dentry *); int (*show_path)(struct seq_file *, struct dentry *); int (*show_stats)(struct seq_file *, struct dentry *);