mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: Add show_options2 to view private mount data"

Browse Source 
This reverts commit e2b3aa25c5
(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 <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Eric Biggers
2020-08-07 10:00:27 -07:00
committed by Greg Kroah-Hartman
parent 55bbced253
commit 3663c286ac
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/proc_namespace.c
View File

@@ -121,9 +121,7 @@ static int show_vfsmnt(struct seq_file *m, struct vfsmount *mnt)
if (err) if (err)
goto out; goto out;
show_mnt_opts(m, mnt); show_mnt_opts(m, mnt);
if (sb->s_op->show_options2) if (sb->s_op->show_options)
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); err = sb->s_op->show_options(m, mnt_path.dentry);
seq_puts(m, " 0 0\n"); seq_puts(m, " 0 0\n");
out: out:
@@ -185,9 +183,7 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)
err = show_sb_opts(m, sb); err = show_sb_opts(m, sb);
if (err) if (err)
goto out; goto out;
if (sb->s_op->show_options2) { if (sb->s_op->show_options)
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); err = sb->s_op->show_options(m, mnt->mnt_root);
seq_putc(m, '\n'); seq_putc(m, '\n');
out: out:

1
include/linux/fs.h
View File

@@ -1937,7 +1937,6 @@ struct super_operations {
void (*umount_begin) (struct super_block *); void (*umount_begin) (struct super_block *);
int (*show_options)(struct seq_file *, struct dentry *); 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_devname)(struct seq_file *, struct dentry *);
int (*show_path)(struct seq_file *, struct dentry *); int (*show_path)(struct seq_file *, struct dentry *);
int (*show_stats)(struct seq_file *, struct dentry *); int (*show_stats)(struct seq_file *, struct dentry *);