convert get_sb_single() users (fc14f2fe) · Commits · e / devices / android_kernel_xiaomi_markw

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

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -798,17 +798,17 @@ spufs_fill_super(struct super_block sb, void data, int silent)
	return spufs_create_root(sb, data);		return spufs_create_root(sb, data);
	}		}

	static int		static struct dentry *
	spufs_get_sb(struct file_system_type *fstype, int flags,		spufs_mount(struct file_system_type *fstype, int flags,
	const char name, void data, struct vfsmount *mnt)		const char name, void data)
	{		{
	return get_sb_single(fstype, flags, data, spufs_fill_super, mnt);		return mount_single(fstype, flags, data, spufs_fill_super);
	}		}

	static struct file_system_type spufs_type = {		static struct file_system_type spufs_type = {
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.name = "spufs",		.name = "spufs",
	.get_sb = spufs_get_sb,		.mount = spufs_mount,
	.kill_sb = kill_litter_super,		.kill_sb = kill_litter_super,
	};		};

arch/s390/hypfs/inode.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -316,10 +316,10 @@ static int hypfs_fill_super(struct super_block sb, void data, int silent)
	return 0;		return 0;
	}		}

	static int hypfs_get_super(struct file_system_type *fst, int flags,		static struct dentry hypfs_mount(struct file_system_type fst, int flags,
	const char devname, void data, struct vfsmount *mnt)		const char devname, void data)
	{		{
	return get_sb_single(fst, flags, data, hypfs_fill_super, mnt);		return mount_single(fst, flags, data, hypfs_fill_super);
	}		}

	static void hypfs_kill_super(struct super_block *sb)		static void hypfs_kill_super(struct super_block *sb)
	@@ -455,7 +455,7 @@ static const struct file_operations hypfs_file_ops = {
	static struct file_system_type hypfs_type = {		static struct file_system_type hypfs_type = {
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.name = "s390_hypfs",		.name = "s390_hypfs",
	.get_sb = hypfs_get_super,		.mount = hypfs_mount,
	.kill_sb = hypfs_kill_super		.kill_sb = hypfs_kill_super
	};		};

drivers/base/devtmpfs.c

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -29,33 +29,33 @@
	static struct vfsmount *dev_mnt;		static struct vfsmount *dev_mnt;

	#if defined CONFIG_DEVTMPFS_MOUNT		#if defined CONFIG_DEVTMPFS_MOUNT
	static int dev_mount = 1;		static int mount_dev = 1;
	#else		#else
	static int dev_mount;		static int mount_dev;
	#endif		#endif

	static DEFINE_MUTEX(dirlock);		static DEFINE_MUTEX(dirlock);

	static int __init mount_param(char *str)		static int __init mount_param(char *str)
	{		{
	dev_mount = simple_strtoul(str, NULL, 0);		mount_dev = simple_strtoul(str, NULL, 0);
	return 1;		return 1;
	}		}
	__setup("devtmpfs.mount=", mount_param);		__setup("devtmpfs.mount=", mount_param);

	static int dev_get_sb(struct file_system_type *fs_type, int flags,		static struct dentry dev_mount(struct file_system_type fs_type, int flags,
	const char dev_name, void data, struct vfsmount *mnt)		const char dev_name, void data)
	{		{
	#ifdef CONFIG_TMPFS		#ifdef CONFIG_TMPFS
	return get_sb_single(fs_type, flags, data, shmem_fill_super, mnt);		return mount_single(fs_type, flags, data, shmem_fill_super);
	#else		#else
	return get_sb_single(fs_type, flags, data, ramfs_fill_super, mnt);		return mount_single(fs_type, flags, data, ramfs_fill_super);
	#endif		#endif
	}		}

	static struct file_system_type dev_fs_type = {		static struct file_system_type dev_fs_type = {
	.name = "devtmpfs",		.name = "devtmpfs",
	.get_sb = dev_get_sb,		.mount = dev_mount,
	.kill_sb = kill_litter_super,		.kill_sb = kill_litter_super,
	};		};

	@@ -351,7 +351,7 @@ int devtmpfs_mount(const char *mntdir)
	{		{
	int err;		int err;

	if (!dev_mount)		if (!mount_dev)
	return 0;		return 0;

	if (!dev_mnt)		if (!dev_mnt)

drivers/infiniband/hw/ipath/ipath_fs.c

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -362,13 +362,13 @@ bail:
	return ret;		return ret;
	}		}

	static int ipathfs_get_sb(struct file_system_type *fs_type, int flags,		static struct dentry ipathfs_mount(struct file_system_type fs_type,
	const char dev_name, void data, struct vfsmount *mnt)		int flags, const char dev_name, void data)
	{		{
	int ret = get_sb_single(fs_type, flags, data,		struct dentry *ret;
	ipathfs_fill_super, mnt);		ret = mount_single(fs_type, flags, data, ipathfs_fill_super);
	if (ret >= 0)		if (!IS_ERR(ret))
	ipath_super = mnt->mnt_sb;		ipath_super = ret->d_sb;
	return ret;		return ret;
	}		}

	@@ -411,7 +411,7 @@ bail:
	static struct file_system_type ipathfs_fs_type = {		static struct file_system_type ipathfs_fs_type = {
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.name = "ipathfs",		.name = "ipathfs",
	.get_sb = ipathfs_get_sb,		.mount = ipathfs_mount,
	.kill_sb = ipathfs_kill_super,		.kill_sb = ipathfs_kill_super,
	};		};

drivers/infiniband/hw/qib/qib_fs.c

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -555,13 +555,13 @@ bail:
	return ret;		return ret;
	}		}

	static int qibfs_get_sb(struct file_system_type *fs_type, int flags,		static struct dentry qibfs_mount(struct file_system_type fs_type, int flags,
	const char dev_name, void data, struct vfsmount *mnt)		const char dev_name, void data)
	{		{
	int ret = get_sb_single(fs_type, flags, data,		struct dentry *ret;
	qibfs_fill_super, mnt);		ret = mount_single(fs_type, flags, data, qibfs_fill_super);
	if (ret >= 0)		if (!IS_ERR(ret))
	qib_super = mnt->mnt_sb;		qib_super = ret->d_sb;
	return ret;		return ret;
	}		}

	@@ -603,7 +603,7 @@ int qibfs_remove(struct qib_devdata *dd)
	static struct file_system_type qibfs_fs_type = {		static struct file_system_type qibfs_fs_type = {
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.name = "ipathfs",		.name = "ipathfs",
	.get_sb = qibfs_get_sb,		.mount = qibfs_mount,
	.kill_sb = qibfs_kill_super,		.kill_sb = qibfs_kill_super,
	};		};