diff options
| author | \"Talpey, Thomas\ <Thomas.Talpey@netapp.com> | 2007-09-10 19:43:29 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-10-09 23:17:23 +0200 |
| commit | 6b18eaa0821a559c5e2b7ed4b90f8aca5a8e6228 (patch) | |
| tree | 25f02ce2813cf7bc37b73b5a14a9a037c187eab7 /fs/nfs | |
| parent | SUNRPC: export per-transport rpcbind netid's (diff) | |
| download | linux-6b18eaa0821a559c5e2b7ed4b90f8aca5a8e6228.tar.xz linux-6b18eaa0821a559c5e2b7ed4b90f8aca5a8e6228.zip | |
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: Tom Talpey <tmt@netapp.com>
Acked-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/internal.h | 33 | ||||
| -rw-r--r-- | fs/nfs/super.c | 31 |
2 files changed, 33 insertions, 31 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 76cf55d57101..9c2d0fbb9f89 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -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; diff --git a/fs/nfs/super.c b/fs/nfs/super.c index a955821b8499..2fd28c4df1d4 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -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, |