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

Commit 4cc7c186 authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

bpf: Implement show_options 



Implement the show_options superblock op for bpf as part of a bid to get
rid of s_options and generic_show_options() to make it easier to implement
a context-based mount where the mount options can be passed individually
over a file descriptor.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Alexei Starovoitov <ast@kernel.org>
cc: Daniel Borkmann <daniel@iogearbox.net>
cc: netdev@vger.kernel.org
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 604ecf42

kernel/bpf/inode.c

+13 −3
Original line number Original line Diff line number Diff line
@@ -377,10 +377,22 @@ static void bpf_evict_inode(struct inode *inode) 
		bpf_any_put(inode->i_private, type);

		bpf_any_put(inode->i_private, type);

}

}





/*

 * Display the mount options in /proc/mounts.

 */

static int bpf_show_options(struct seq_file *m, struct dentry *root)

{

	umode_t mode = d_inode(root)->i_mode & S_IALLUGO & ~S_ISVTX;



	if (mode != S_IRWXUGO)

		seq_printf(m, ",mode=%o", mode);

	return 0;

}



static const struct super_operations bpf_super_ops = {

static const struct super_operations bpf_super_ops = {

	.statfs		= simple_statfs,

	.statfs		= simple_statfs,

	.drop_inode	= generic_delete_inode,

	.drop_inode	= generic_delete_inode,

	.show_options	= generic_show_options,

	.show_options	= bpf_show_options,

	.evict_inode	= bpf_evict_inode,

	.evict_inode	= bpf_evict_inode,

};

};
@@ -434,8 +446,6 @@ static int bpf_fill_super(struct super_block *sb, void *data, int silent) 
	struct inode *inode;

	struct inode *inode;

	int ret;

	int ret;





	save_mount_options(sb, data);



	ret = bpf_parse_options(data, &opts);

	ret = bpf_parse_options(data, &opts);

	if (ret)

	if (ret)

		return ret;

		return ret;