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

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

spufs: Implement show_options 



Implement the show_options superblock op for spufs 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: Jeremy Kerr <jk@ozlabs.org>
cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 4cc7c186

arch/powerpc/platforms/cell/spufs/inode.c

+19 −3
Original line number Diff line number Diff line
@@ -605,6 +605,24 @@ static const match_table_t spufs_tokens = { 
	{ Opt_err,    NULL  },

};



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

{

	struct spufs_sb_info *sbi = spufs_get_sb_info(root->d_sb);

	struct inode *inode = root->d_inode;



	if (!uid_eq(inode->i_uid, GLOBAL_ROOT_UID))

		seq_printf(m, ",uid=%u",

			   from_kuid_munged(&init_user_ns, inode->i_uid));

	if (!gid_eq(inode->i_gid, GLOBAL_ROOT_GID))

		seq_printf(m, ",gid=%u",

			   from_kgid_munged(&init_user_ns, inode->i_gid));

	if ((inode->i_mode & S_IALLUGO) != 0775)

		seq_printf(m, ",mode=%o", inode->i_mode);

	if (sbi->debug)

		seq_puts(m, ",debug");

	return 0;

}



static int

spufs_parse_options(struct super_block *sb, char *options, struct inode *root)

{
@@ -724,11 +742,9 @@ spufs_fill_super(struct super_block *sb, void *data, int silent) 
		.destroy_inode = spufs_destroy_inode,

		.statfs = simple_statfs,

		.evict_inode = spufs_evict_inode,

		.show_options = generic_show_options,

		.show_options = spufs_show_options,

	};



	save_mount_options(sb, data);



	info = kzalloc(sizeof(*info), GFP_KERNEL);

	if (!info)

		return -ENOMEM;