convert get_sb_pseudo() users (51139ada) · Commits · e / devices / android_kernel_xiaomi_markw

arch/ia64/kernel/perfmon.c

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -618,16 +618,15 @@ pfm_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
	}		}


	static int		static struct dentry *
	pfmfs_get_sb(struct file_system_type fs_type, int flags, const char dev_name, void *data,		pfmfs_mount(struct file_system_type fs_type, int flags, const char dev_name, void *data)
	struct vfsmount *mnt)
	{		{
	return get_sb_pseudo(fs_type, "pfm:", NULL, PFMFS_MAGIC, mnt);		return mount_pseudo(fs_type, "pfm:", NULL, PFMFS_MAGIC);
	}		}

	static struct file_system_type pfm_fs_type = {		static struct file_system_type pfm_fs_type = {
	.name = "pfmfs",		.name = "pfmfs",
	.get_sb = pfmfs_get_sb,		.mount = pfmfs_mount,
	.kill_sb = kill_anon_super,		.kill_sb = kill_anon_super,
	};		};

drivers/mtd/mtdchar.c

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1030,17 +1030,15 @@ static const struct file_operations mtd_fops = {
	#endif		#endif
	};		};

	static int mtd_inodefs_get_sb(struct file_system_type *fs_type, int flags,		static struct dentry mtd_inodefs_mount(struct file_system_type fs_type,
	const char dev_name, void data,		int flags, const char dev_name, void data)
	struct vfsmount *mnt)
	{		{
	return get_sb_pseudo(fs_type, "mtd_inode:", NULL, MTD_INODE_FS_MAGIC,		return mount_pseudo(fs_type, "mtd_inode:", NULL, MTD_INODE_FS_MAGIC);
	mnt);
	}		}

	static struct file_system_type mtd_inodefs_type = {		static struct file_system_type mtd_inodefs_type = {
	.name = "mtd_inodefs",		.name = "mtd_inodefs",
	.get_sb = mtd_inodefs_get_sb,		.mount = mtd_inodefs_mount,
	.kill_sb = kill_anon_super,		.kill_sb = kill_anon_super,
	};		};

fs/anon_inodes.c

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -26,12 +26,10 @@ static struct vfsmount *anon_inode_mnt __read_mostly;
	static struct inode *anon_inode_inode;		static struct inode *anon_inode_inode;
	static const struct file_operations anon_inode_fops;		static const struct file_operations anon_inode_fops;

	static int anon_inodefs_get_sb(struct file_system_type *fs_type, int flags,		static struct dentry anon_inodefs_mount(struct file_system_type fs_type,
	const char dev_name, void data,		int flags, const char dev_name, void data)
	struct vfsmount *mnt)
	{		{
	return get_sb_pseudo(fs_type, "anon_inode:", NULL, ANON_INODE_FS_MAGIC,		return mount_pseudo(fs_type, "anon_inode:", NULL, ANON_INODE_FS_MAGIC);
	mnt);
	}		}

	/*		/*
	@@ -45,7 +43,7 @@ static char anon_inodefs_dname(struct dentry dentry, char *buffer, int buflen)

	static struct file_system_type anon_inode_fs_type = {		static struct file_system_type anon_inode_fs_type = {
	.name = "anon_inodefs",		.name = "anon_inodefs",
	.get_sb = anon_inodefs_get_sb,		.mount = anon_inodefs_mount,
	.kill_sb = kill_anon_super,		.kill_sb = kill_anon_super,
	};		};
	static const struct dentry_operations anon_inodefs_dentry_operations = {		static const struct dentry_operations anon_inodefs_dentry_operations = {

fs/block_dev.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -464,15 +464,15 @@ static const struct super_operations bdev_sops = {
	.evict_inode = bdev_evict_inode,		.evict_inode = bdev_evict_inode,
	};		};

	static int bd_get_sb(struct file_system_type *fs_type,		static struct dentry bd_mount(struct file_system_type fs_type,
	int flags, const char dev_name, void data, struct vfsmount *mnt)		int flags, const char dev_name, void data)
	{		{
	return get_sb_pseudo(fs_type, "bdev:", &bdev_sops, 0x62646576, mnt);		return mount_pseudo(fs_type, "bdev:", &bdev_sops, 0x62646576);
	}		}

	static struct file_system_type bd_type = {		static struct file_system_type bd_type = {
	.name = "bdev",		.name = "bdev",
	.get_sb = bd_get_sb,		.mount = bd_mount,
	.kill_sb = kill_anon_super,		.kill_sb = kill_anon_super,
	};		};

fs/libfs.c

+6 −8

Original line number	Original line	Diff line number	Diff line
	@@ -201,9 +201,8 @@ static const struct super_operations simple_super_operations = {
	* Common helper for pseudo-filesystems (sockfs, pipefs, bdev - stuff that		* Common helper for pseudo-filesystems (sockfs, pipefs, bdev - stuff that
	* will never be mountable)		* will never be mountable)
	*/		*/
	int get_sb_pseudo(struct file_system_type fs_type, char name,		struct dentry mount_pseudo(struct file_system_type fs_type, char *name,
	const struct super_operations *ops, unsigned long magic,		const struct super_operations *ops, unsigned long magic)
	struct vfsmount *mnt)
	{		{
	struct super_block *s = sget(fs_type, NULL, set_anon_super, NULL);		struct super_block *s = sget(fs_type, NULL, set_anon_super, NULL);
	struct dentry *dentry;		struct dentry *dentry;
	@@ -211,7 +210,7 @@ int get_sb_pseudo(struct file_system_type fs_type, char name,
	struct qstr d_name = {.name = name, .len = strlen(name)};		struct qstr d_name = {.name = name, .len = strlen(name)};

	if (IS_ERR(s))		if (IS_ERR(s))
	return PTR_ERR(s);		return ERR_CAST(s);

	s->s_flags = MS_NOUSER;		s->s_flags = MS_NOUSER;
	s->s_maxbytes = MAX_LFS_FILESIZE;		s->s_maxbytes = MAX_LFS_FILESIZE;
	@@ -241,12 +240,11 @@ int get_sb_pseudo(struct file_system_type fs_type, char name,
	d_instantiate(dentry, root);		d_instantiate(dentry, root);
	s->s_root = dentry;		s->s_root = dentry;
	s->s_flags \|= MS_ACTIVE;		s->s_flags \|= MS_ACTIVE;
	simple_set_mnt(mnt, s);		return dget(s->s_root);
	return 0;

	Enomem:		Enomem:
	deactivate_locked_super(s);		deactivate_locked_super(s);
	return -ENOMEM;		return ERR_PTR(-ENOMEM);
	}		}

	int simple_link(struct dentry old_dentry, struct inode dir, struct dentry *dentry)		int simple_link(struct dentry old_dentry, struct inode dir, struct dentry *dentry)
	@@ -951,7 +949,7 @@ EXPORT_SYMBOL(dcache_dir_lseek);
	EXPORT_SYMBOL(dcache_dir_open);		EXPORT_SYMBOL(dcache_dir_open);
	EXPORT_SYMBOL(dcache_readdir);		EXPORT_SYMBOL(dcache_readdir);
	EXPORT_SYMBOL(generic_read_dir);		EXPORT_SYMBOL(generic_read_dir);
	EXPORT_SYMBOL(get_sb_pseudo);		EXPORT_SYMBOL(mount_pseudo);
	EXPORT_SYMBOL(simple_write_begin);		EXPORT_SYMBOL(simple_write_begin);
	EXPORT_SYMBOL(simple_write_end);		EXPORT_SYMBOL(simple_write_end);
	EXPORT_SYMBOL(simple_dir_inode_operations);		EXPORT_SYMBOL(simple_dir_inode_operations);