Commit d0b779d4 authored by Al Viro's avatar Al Viro Committed by Anna Schumaker
Browse files

nfs: stash server into struct nfs_mount_info 



Reviewed-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 444a5296

fs/nfs/internal.h

+2 −1
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ struct nfs_mount_info { 
	int (*set_security)(struct super_block *, struct dentry *, struct nfs_mount_info *);

	struct nfs_parsed_mount_data *parsed;

	struct nfs_clone_mount *cloned;

	struct nfs_server *server;

	struct nfs_fh *mntfh;

};
@@ -397,7 +398,7 @@ struct dentry *nfs_try_mount(int, const char *, struct nfs_mount_info *, 
			struct nfs_subversion *);

int nfs_set_sb_security(struct super_block *, struct dentry *, struct nfs_mount_info *);

int nfs_clone_sb_security(struct super_block *, struct dentry *, struct nfs_mount_info *);

struct dentry *nfs_fs_mount_common(struct nfs_server *, int, const char *,

struct dentry *nfs_fs_mount_common(int, const char *,

				   struct nfs_mount_info *, struct nfs_subversion *);

struct dentry *nfs_fs_mount(struct file_system_type *, int, const char *, void *);

struct dentry * nfs_xdev_mount_common(struct file_system_type *, int,

fs/nfs/nfs4super.c

+4 −6
Original line number Diff line number Diff line
@@ -109,13 +109,12 @@ nfs4_remote_mount(struct file_system_type *fs_type, int flags, 
		  const char *dev_name, void *info)

{

	struct nfs_mount_info *mount_info = info;

	struct nfs_server *server;



	mount_info->set_security = nfs_set_sb_security;



	/* Get a volume representation */

	server = nfs4_create_server(mount_info, &nfs_v4);

	return nfs_fs_mount_common(server, flags, dev_name, mount_info, &nfs_v4);

	mount_info->server = nfs4_create_server(mount_info, &nfs_v4);

	return nfs_fs_mount_common(flags, dev_name, mount_info, &nfs_v4);

}



static struct vfsmount *nfs_do_root_mount(struct file_system_type *fs_type,
@@ -260,7 +259,6 @@ nfs4_remote_referral_mount(struct file_system_type *fs_type, int flags, 
		.set_security = nfs_clone_sb_security,

		.cloned = raw_data,

	};

	struct nfs_server *server;

	struct dentry *mntroot = ERR_PTR(-ENOMEM);



	dprintk("--> nfs4_referral_get_sb()\n");
@@ -270,8 +268,8 @@ nfs4_remote_referral_mount(struct file_system_type *fs_type, int flags, 
		goto out;



	/* create a new volume representation */

	server = nfs4_create_referral_server(mount_info.cloned, mount_info.mntfh);

	mntroot = nfs_fs_mount_common(server, flags, dev_name, &mount_info, &nfs_v4);

	mount_info.server = nfs4_create_referral_server(mount_info.cloned, mount_info.mntfh);

	mntroot = nfs_fs_mount_common(flags, dev_name, &mount_info, &nfs_v4);

out:

	nfs_free_fhandle(mount_info.mntfh);

	return mntroot;

fs/nfs/super.c

+8 −11
Original line number Diff line number Diff line
@@ -1896,14 +1896,12 @@ struct dentry *nfs_try_mount(int flags, const char *dev_name, 
			     struct nfs_mount_info *mount_info,

			     struct nfs_subversion *nfs_mod)

{

	struct nfs_server *server;



	if (mount_info->parsed->need_mount)

		server = nfs_try_mount_request(mount_info, nfs_mod);

		mount_info->server = nfs_try_mount_request(mount_info, nfs_mod);

	else

		server = nfs_mod->rpc_ops->create_server(mount_info, nfs_mod);

		mount_info->server = nfs_mod->rpc_ops->create_server(mount_info, nfs_mod);



	return nfs_fs_mount_common(server, flags, dev_name, mount_info, nfs_mod);

	return nfs_fs_mount_common(flags, dev_name, mount_info, nfs_mod);

}

EXPORT_SYMBOL_GPL(nfs_try_mount);
@@ -2649,20 +2647,21 @@ static void nfs_set_readahead(struct backing_dev_info *bdi, 
	bdi->io_pages = iomax_pages;

}



struct dentry *nfs_fs_mount_common(struct nfs_server *server,

				   int flags, const char *dev_name,

struct dentry *nfs_fs_mount_common(int flags, const char *dev_name,

				   struct nfs_mount_info *mount_info,

				   struct nfs_subversion *nfs_mod)

{

	struct super_block *s;

	struct dentry *mntroot = ERR_PTR(-ENOMEM);

	int (*compare_super)(struct super_block *, void *) = nfs_compare_super;

	struct nfs_server *server = mount_info->server;

	struct nfs_sb_mountdata sb_mntdata = {

		.mntflags = flags,

		.server = server,

	};

	int error;



	mount_info->server = NULL;

	if (IS_ERR(server))

		return ERR_CAST(server);
@@ -2803,7 +2802,6 @@ nfs_xdev_mount(struct file_system_type *fs_type, int flags, 
		.set_security = nfs_clone_sb_security,

		.cloned = data,

	};

	struct nfs_server *server;

	struct dentry *mntroot = ERR_PTR(-ENOMEM);

	struct nfs_subversion *nfs_mod = NFS_SB(data->sb)->nfs_client->cl_nfs_mod;
@@ -2812,10 +2810,9 @@ nfs_xdev_mount(struct file_system_type *fs_type, int flags, 
	mount_info.mntfh = mount_info.cloned->fh;



	/* create a new volume representation */

	server = nfs_mod->rpc_ops->clone_server(NFS_SB(data->sb), data->fh, data->fattr, data->authflavor);

	mount_info.server = nfs_mod->rpc_ops->clone_server(NFS_SB(data->sb), data->fh, data->fattr, data->authflavor);



	mntroot = nfs_fs_mount_common(server, flags,

				dev_name, &mount_info, nfs_mod);

	mntroot = nfs_fs_mount_common(flags, dev_name, &mount_info, nfs_mod);



	dprintk("<-- nfs_xdev_mount() = %ld\n",

			IS_ERR(mntroot) ? PTR_ERR(mntroot) : 0L);