Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2b3aa25 authored by Daniel Rosenberg's avatar Daniel Rosenberg Committed by Alistair Delva
Browse files

ANDROID: Add show_options2 to view private mount data 



Exposes private fs data via show_options2

Bug: 120446149
Change-Id: I2d1c06fae274eeac03ac1924ef162f7bbb2f29d0
Signed-off-by: default avatarDaniel Rosenberg <drosen@google.com>
parent 4fd07efd

fs/proc_namespace.c

+6 −2
Original line number Diff line number Diff line
@@ -121,7 +121,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:
@@ -183,7 +185,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:

include/linux/fs.h

+1 −0
Original line number Diff line number Diff line
@@ -1939,6 +1939,7 @@ 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 *);