nfs: fold nfs4_remote_fs_type and nfs4_remote_referral_fs_type (15a9c4ef) · Commits · 戴 / test

fs/nfs/nfs4super.c

+4 −22

Original line number	Diff line number	Diff line
		@@ -22,8 +22,6 @@ static struct dentry nfs4_remote_mount(struct file_system_type fs_type,
		int flags, const char dev_name, void raw_data);
		static struct dentry nfs4_referral_mount(struct file_system_type fs_type,
		int flags, const char dev_name, void raw_data);
		static struct dentry nfs4_remote_referral_mount(struct file_system_type fs_type,
		int flags, const char dev_name, void raw_data);

		static struct file_system_type nfs4_remote_fs_type = {
		.owner = THIS_MODULE,
		@@ -33,14 +31,6 @@ static struct file_system_type nfs4_remote_fs_type = {
		.fs_flags = FS_RENAME_DOES_D_MOVE\|FS_BINARY_MOUNTDATA,
		};

		static struct file_system_type nfs4_remote_referral_fs_type = {
		.owner = THIS_MODULE,
		.name = "nfs4",
		.mount = nfs4_remote_referral_mount,
		.kill_sb = nfs_kill_super,
		.fs_flags = FS_RENAME_DOES_D_MOVE\|FS_BINARY_MOUNTDATA,
		};

		struct file_system_type nfs4_referral_fs_type = {
		.owner = THIS_MODULE,
		.name = "nfs4",
		@@ -111,8 +101,7 @@ nfs4_remote_mount(struct file_system_type *fs_type, int flags,
		return nfs_fs_mount_common(flags, dev_name, info, &nfs_v4);
		}

		static struct vfsmount nfs_do_root_mount(struct file_system_type fs_type,
		struct nfs_server *server, int flags,
		static struct vfsmount nfs_do_root_mount(struct nfs_server server, int flags,
		struct nfs_mount_info *info,
		const char *hostname)
		{
		@@ -135,7 +124,7 @@ static struct vfsmount nfs_do_root_mount(struct file_system_type fs_type,
		else
		snprintf(root_devname, len, "%s:/", hostname);
		info->server = server;
		root_mnt = vfs_kern_mount(fs_type, flags, root_devname, info);
		root_mnt = vfs_kern_mount(&nfs4_remote_fs_type, flags, root_devname, info);
		if (info->server)
		nfs_free_server(info->server);
		info->server = NULL;
		@@ -245,7 +234,7 @@ struct dentry nfs4_try_mount(int flags, const char dev_name,

		export_path = data->nfs_server.export_path;
		data->nfs_server.export_path = "/";
		root_mnt = nfs_do_root_mount(&nfs4_remote_fs_type,
		root_mnt = nfs_do_root_mount(
		nfs4_create_server(mount_info, &nfs_v4),
		flags, mount_info,
		data->nfs_server.hostname);
		@@ -259,13 +248,6 @@ struct dentry nfs4_try_mount(int flags, const char dev_name,
		return res;
		}

		static struct dentry *
		nfs4_remote_referral_mount(struct file_system_type *fs_type, int flags,
		const char dev_name, void raw_data)
		{
		return nfs_fs_mount_common(flags, dev_name, raw_data, &nfs_v4);
		}

		/*
		* Create an NFS4 server record on referral traversal
		*/
		@@ -290,7 +272,7 @@ static struct dentry nfs4_referral_mount(struct file_system_type fs_type,

		export_path = data->mnt_path;
		data->mnt_path = "/";
		root_mnt = nfs_do_root_mount(&nfs4_remote_referral_fs_type,
		root_mnt = nfs_do_root_mount(
		nfs4_create_referral_server(mount_info.cloned,
		mount_info.mntfh),
		flags, &mount_info, data->hostname);

Admin message