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

Commit e9b3961b authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Linus Torvalds
Browse files

mount options: fix affs 



Add a .show_options super operation to affs.

Use generic_show_options() and save the complete option string in
affs_fill_super() and affs_remount().

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e11400b0

fs/affs/super.c

+12 −2
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ static const struct super_operations affs_sops = { 
	.write_super	= affs_write_super,

	.statfs		= affs_statfs,

	.remount_fs	= affs_remount,

	.show_options	= generic_show_options,

};



enum {
@@ -272,6 +273,8 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent) 
	u8			 sig[4];

	int			 ret = -EINVAL;



	save_mount_options(sb, data);



	pr_debug("AFFS: read_super(%s)\n",data ? (const char *)data : "no options");



	sb->s_magic             = AFFS_SUPER_MAGIC;
@@ -487,14 +490,21 @@ affs_remount(struct super_block *sb, int *flags, char *data) 
	int			 root_block;

	unsigned long		 mount_flags;

	int			 res = 0;

	char			*new_opts = kstrdup(data, GFP_KERNEL);



	pr_debug("AFFS: remount(flags=0x%x,opts=\"%s\")\n",*flags,data);



	*flags |= MS_NODIRATIME;



	if (!parse_options(data, &uid, &gid, &mode, &reserved, &root_block,

	    &blocksize,&sbi->s_prefix,sbi->s_volume,&mount_flags))

			   &blocksize, &sbi->s_prefix, sbi->s_volume,

			   &mount_flags)) {

		kfree(new_opts);

		return -EINVAL;

	}

	kfree(sb->s_options);

	sb->s_options = new_opts;



	sbi->s_flags = mount_flags;

	sbi->s_mode  = mode;

	sbi->s_uid   = uid;