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

Commit 6b18eaa0 authored by \"Talpey, Thomas\'s avatar \"Talpey, Thomas\ Committed by Trond Myklebust
Browse files

NFS: move nfs_parsed_mount_data structure definition 



In preparation for rearranging the nfs mount argument passing, make the
nfs_parsed_mount_data struct visible across nfs kernel files.

Signed-off-by: default avatarTom Talpey <tmt@netapp.com>
Acked-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 4417c8c4

fs/nfs/internal.h

+33 −0
Original line number Diff line number Diff line
@@ -27,6 +27,39 @@ struct nfs_clone_mount { 
	rpc_authflavor_t authflavor;

};



/*

 * In-kernel mount arguments

 */

struct nfs_parsed_mount_data {

	int			flags;

	int			rsize, wsize;

	int			timeo, retrans;

	int			acregmin, acregmax,

				acdirmin, acdirmax;

	int			namlen;

	unsigned int		bsize;

	unsigned int		auth_flavor_len;

	rpc_authflavor_t	auth_flavors[1];

	char			*client_address;



	struct {

		struct sockaddr_in	address;

		char			*hostname;

		unsigned int		program;

		unsigned int		version;

		unsigned short		port;

		int			protocol;

	} mount_server;



	struct {

		struct sockaddr_in	address;

		char			*hostname;

		char			*export_path;

		unsigned int		program;

		int			protocol;

	} nfs_server;

};



/* client.c */

extern struct rpc_program nfs_program;

fs/nfs/super.c

+0 −31
Original line number Diff line number Diff line
@@ -58,37 +58,6 @@ 


#define NFSDBG_FACILITY		NFSDBG_VFS





struct nfs_parsed_mount_data {

	int			flags;

	int			rsize, wsize;

	int			timeo, retrans;

	int			acregmin, acregmax,

				acdirmin, acdirmax;

	int			namlen;

	unsigned int		bsize;

	unsigned int		auth_flavor_len;

	rpc_authflavor_t	auth_flavors[1];

	char			*client_address;



	struct {

		struct sockaddr_in	address;

		char			*hostname;

		unsigned int		program;

		unsigned int		version;

		unsigned short		port;

		int			protocol;

	} mount_server;



	struct {

		struct sockaddr_in	address;

		char			*hostname;

		char			*export_path;

		unsigned int		program;

		int			protocol;

	} nfs_server;

};



enum {

	/* Mount options that take no arguments */

	Opt_soft, Opt_hard,