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

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

orangefs: Implement show_options 



Implement the show_options superblock op for orangefs as part of a bid to
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: Mike Marshall <hubcap@omnibond.com>
cc: pvfs2-developers@beowulf-underground.org
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c4fac910

fs/orangefs/super.c

+14 −1
Original line number Diff line number Diff line
@@ -35,6 +35,19 @@ static const match_table_t tokens = { 


uint64_t orangefs_features;



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

{

	struct orangefs_sb_info_s *orangefs_sb = ORANGEFS_SB(root->d_sb);



	if (root->d_sb->s_flags & MS_POSIXACL)

		seq_puts(m, ",acl");

	if (orangefs_sb->flags & ORANGEFS_OPT_INTR)

		seq_puts(m, ",intr");

	if (orangefs_sb->flags & ORANGEFS_OPT_LOCAL_LOCK)

		seq_puts(m, ",local_lock");

	return 0;

}



static int parse_mount_options(struct super_block *sb, char *options,

		int silent)

{
@@ -305,7 +318,7 @@ static const struct super_operations orangefs_s_ops = { 
	.drop_inode = generic_delete_inode,

	.statfs = orangefs_statfs,

	.remount_fs = orangefs_remount_fs,

	.show_options = generic_show_options,

	.show_options = orangefs_show_options,

};



static struct dentry *orangefs_fh_to_dentry(struct super_block *sb,