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

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

mount options: fix hugetlbfs 



Add a .show_options super operation to hugetlbfs.

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

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Cc: Adam Litke <agl@us.ibm.com>
Cc: Badari Pulavarty <pbadari@us.ibm.com>
Cc: Ken Chen <kenchen@google.com>
Cc: William Lee Irwin III <wli@holomorphy.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6d9c1fd4

fs/hugetlbfs/inode.c

+3 −0
Original line number Diff line number Diff line
@@ -734,6 +734,7 @@ static const struct super_operations hugetlbfs_ops = { 
	.delete_inode	= hugetlbfs_delete_inode,

	.drop_inode	= hugetlbfs_drop_inode,

	.put_super	= hugetlbfs_put_super,

	.show_options	= generic_show_options,

};



static int
@@ -817,6 +818,8 @@ hugetlbfs_fill_super(struct super_block *sb, void *data, int silent) 
	struct hugetlbfs_config config;

	struct hugetlbfs_sb_info *sbinfo;



	save_mount_options(sb, data);



	config.nr_blocks = -1; /* No limit on size by default */

	config.nr_inodes = -1; /* No limit on number of inodes by default */

	config.uid = current->fsuid;