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

Commit 384f5c96 authored Apr 12, 2011 by OGAWA Hirofumi

fat: use new setup() for ->dir_ops too



Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>

parent a6360dd3

fs/fat/fat.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -319,7 +319,6 @@ extern struct inode fat_build_inode(struct super_block sb,
	struct msdos_dir_entry *de, loff_t i_pos);		struct msdos_dir_entry *de, loff_t i_pos);
	extern int fat_sync_inode(struct inode *inode);		extern int fat_sync_inode(struct inode *inode);
	extern int fat_fill_super(struct super_block sb, void data, int silent,		extern int fat_fill_super(struct super_block sb, void data, int silent,
	const struct inode_operations *fs_dir_inode_ops,
	int isvfat, void (setup)(struct super_block ));		int isvfat, void (setup)(struct super_block ));

	extern int fat_flush_inodes(struct super_block sb, struct inode i1,		extern int fat_flush_inodes(struct super_block sb, struct inode i1,

fs/fat/inode.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1238,8 +1238,7 @@ static int fat_read_root(struct inode *inode)
	/*		/*
	* Read the super block of an MS-DOS FS.		* Read the super block of an MS-DOS FS.
	*/		*/
	int fat_fill_super(struct super_block sb, void data, int silent,		int fat_fill_super(struct super_block sb, void data, int silent, int isvfat,
	const struct inode_operations *fs_dir_inode_ops, int isvfat,
	void (setup)(struct super_block ))		void (setup)(struct super_block ))
	{		{
	struct inode root_inode = NULL, fat_inode = NULL;		struct inode root_inode = NULL, fat_inode = NULL;
	@@ -1268,7 +1267,6 @@ int fat_fill_super(struct super_block sb, void data, int silent,
	sb->s_magic = MSDOS_SUPER_MAGIC;		sb->s_magic = MSDOS_SUPER_MAGIC;
	sb->s_op = &fat_sops;		sb->s_op = &fat_sops;
	sb->s_export_op = &fat_export_ops;		sb->s_export_op = &fat_export_ops;
	sbi->dir_ops = fs_dir_inode_ops;
	ratelimit_state_init(&sbi->ratelimit, DEFAULT_RATELIMIT_INTERVAL,		ratelimit_state_init(&sbi->ratelimit, DEFAULT_RATELIMIT_INTERVAL,
	DEFAULT_RATELIMIT_BURST);		DEFAULT_RATELIMIT_BURST);

fs/fat/namei_msdos.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -659,14 +659,14 @@ static const struct inode_operations msdos_dir_inode_operations = {

	static void setup(struct super_block *sb)		static void setup(struct super_block *sb)
	{		{
			MSDOS_SB(sb)->dir_ops = &msdos_dir_inode_operations;
	sb->s_d_op = &msdos_dentry_operations;		sb->s_d_op = &msdos_dentry_operations;
	sb->s_flags \|= MS_NOATIME;		sb->s_flags \|= MS_NOATIME;
	}		}

	static int msdos_fill_super(struct super_block sb, void data, int silent)		static int msdos_fill_super(struct super_block sb, void data, int silent)
	{		{
	return fat_fill_super(sb, data, silent, &msdos_dir_inode_operations,		return fat_fill_super(sb, data, silent, 0, setup);
	0, setup);
	}		}

	static struct dentry msdos_mount(struct file_system_type fs_type,		static struct dentry msdos_mount(struct file_system_type fs_type,

fs/fat/namei_vfat.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1065,6 +1065,7 @@ static const struct inode_operations vfat_dir_inode_operations = {

	static void setup(struct super_block *sb)		static void setup(struct super_block *sb)
	{		{
			MSDOS_SB(sb)->dir_ops = &vfat_dir_inode_operations;
	if (MSDOS_SB(sb)->options.name_check != 's')		if (MSDOS_SB(sb)->options.name_check != 's')
	sb->s_d_op = &vfat_ci_dentry_ops;		sb->s_d_op = &vfat_ci_dentry_ops;
	else		else
	@@ -1073,8 +1074,7 @@ static void setup(struct super_block *sb)

	static int vfat_fill_super(struct super_block sb, void data, int silent)		static int vfat_fill_super(struct super_block sb, void data, int silent)
	{		{
	return fat_fill_super(sb, data, silent, &vfat_dir_inode_operations,		return fat_fill_super(sb, data, silent, 1, setup);
	1, setup);
	}		}

	static struct dentry vfat_mount(struct file_system_type fs_type,		static struct dentry vfat_mount(struct file_system_type fs_type,