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

Commit 1a04c6e1 authored by Peng Tao's avatar Peng Tao Committed by Tom Haynes
Browse files

nfsv3: introduce nfs3_set_ds_client 



The flexfiles layout wants to create DS connection over NFSv3.
Add nfs3_set_ds_client to allow that to happen.

Signed-off-by: default avatarPeng Tao <tao.peng@primarydata.com>
Signed-off-by: default avatarTom Haynes <Thomas.Haynes@primarydata.com>
parent 39280a5a

fs/nfs/internal.h

+4 −0
Original line number Diff line number Diff line
@@ -193,6 +193,10 @@ extern struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp, 
					     rpc_authflavor_t au_flavor);

extern struct rpc_clnt *nfs4_find_or_create_ds_client(struct nfs_client *,

						struct inode *);

extern struct nfs_client *nfs3_set_ds_client(struct nfs_client *mds_clp,

			const struct sockaddr *ds_addr, int ds_addrlen,

			int ds_proto, unsigned int ds_timeo,

			unsigned int ds_retrans, rpc_authflavor_t au_flavor);

#ifdef CONFIG_PROC_FS

extern int __init nfs_fs_proc_init(void);

extern void nfs_fs_proc_exit(void);

fs/nfs/nfs3_fs.h

+2 −0
Original line number Diff line number Diff line
@@ -30,5 +30,7 @@ struct nfs_server *nfs3_create_server(struct nfs_mount_info *, struct nfs_subver 
struct nfs_server *nfs3_clone_server(struct nfs_server *, struct nfs_fh *,

				     struct nfs_fattr *, rpc_authflavor_t);



/* nfs3super.c */

extern struct nfs_subversion nfs_v3;



#endif /* __LINUX_FS_NFS_NFS3_FS_H */

fs/nfs/nfs3client.c

+34 −0
Original line number Diff line number Diff line
@@ -64,3 +64,37 @@ struct nfs_server *nfs3_clone_server(struct nfs_server *source, 
		nfs_init_server_aclclient(server);

	return server;

}



/*

 * Set up a pNFS Data Server client over NFSv3.

 *

 * Return any existing nfs_client that matches server address,port,version

 * and minorversion.

 *

 * For a new nfs_client, use a soft mount (default), a low retrans and a

 * low timeout interval so that if a connection is lost, we retry through

 * the MDS.

 */

struct nfs_client *nfs3_set_ds_client(struct nfs_client *mds_clp,

		const struct sockaddr *ds_addr, int ds_addrlen,

		int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans,

		rpc_authflavor_t au_flavor)

{

	struct nfs_client_initdata cl_init = {

		.addr = ds_addr,

		.addrlen = ds_addrlen,

		.nfs_mod = &nfs_v3,

		.proto = ds_proto,

		.net = mds_clp->cl_net,

	};

	struct rpc_timeout ds_timeout;

	struct nfs_client *clp;



	/* Use the MDS nfs_client cl_ipaddr. */

	nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans);

	clp = nfs_get_client(&cl_init, &ds_timeout, mds_clp->cl_ipaddr,

			     au_flavor);



	return clp;

}

EXPORT_SYMBOL_GPL(nfs3_set_ds_client);

fs/nfs/nfs3super.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include "nfs3_fs.h"

#include "nfs.h"



static struct nfs_subversion nfs_v3 = {

struct nfs_subversion nfs_v3 = {

	.owner = THIS_MODULE,

	.nfs_fs   = &nfs_fs_type,

	.rpc_vers = &nfs_version3,

include/linux/nfs_fs_sb.h

+5 −4
Original line number Diff line number Diff line
@@ -77,10 +77,6 @@ struct nfs_client { 
	/* Client owner identifier */

	const char *		cl_owner_id;



	/* Our own IP address, as a null-terminated string.

	 * This is used to generate the mv0 callback address.

	 */

	char			cl_ipaddr[48];

	u32			cl_cb_ident;	/* v4.0 callback identifier */

	const struct nfs4_minor_version_ops *cl_mvops;

	unsigned long		cl_mig_gen;
@@ -108,6 +104,11 @@ struct nfs_client { 
#define NFS_SP4_MACH_CRED_COMMIT   6	/* COMMIT */

#endif /* CONFIG_NFS_V4 */



	/* Our own IP address, as a null-terminated string.

	 * This is used to generate the mv0 callback address.

	 */

	char			cl_ipaddr[48];



#ifdef CONFIG_NFS_FSCACHE

	struct fscache_cookie	*fscache;	/* client index cache cookie */

#endif