aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
author\"Talpey, Thomas\ <Thomas.Talpey@netapp.com>2007-09-10 13:43:29 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-09 17:17:23 -0400
commit6b18eaa0821a559c5e2b7ed4b90f8aca5a8e6228 (patch)
tree25f02ce2813cf7bc37b73b5a14a9a037c187eab7 /fs
parent4417c8c41a51a2ae95b2a2fa2811640b368c4151 (diff)
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')
-rw-r--r--fs/nfs/internal.h33
-rw-r--r--fs/nfs/super.c31
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 {
27 rpc_authflavor_t authflavor; 27 rpc_authflavor_t authflavor;
28}; 28};
29 29
30/*
31 * In-kernel mount arguments
32 */
33struct nfs_parsed_mount_data {
34 int flags;
35 int rsize, wsize;
36 int timeo, retrans;
37 int acregmin, acregmax,
38 acdirmin, acdirmax;
39 int namlen;
40 unsigned int bsize;
41 unsigned int auth_flavor_len;
42 rpc_authflavor_t auth_flavors[1];
43 char *client_address;
44
45 struct {
46 struct sockaddr_in address;
47 char *hostname;
48 unsigned int program;
49 unsigned int version;
50 unsigned short port;
51 int protocol;
52 } mount_server;
53
54 struct {
55 struct sockaddr_in address;
56 char *hostname;
57 char *export_path;
58 unsigned int program;
59 int protocol;
60 } nfs_server;
61};
62
30/* client.c */ 63/* client.c */
31extern struct rpc_program nfs_program; 64extern struct rpc_program nfs_program;
32 65
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 @@
58 58
59#define NFSDBG_FACILITY NFSDBG_VFS 59#define NFSDBG_FACILITY NFSDBG_VFS
60 60
61
62struct nfs_parsed_mount_data {
63 int flags;
64 int rsize, wsize;
65 int timeo, retrans;
66 int acregmin, acregmax,
67 acdirmin, acdirmax;
68 int namlen;
69 unsigned int bsize;
70 unsigned int auth_flavor_len;
71 rpc_authflavor_t auth_flavors[1];
72 char *client_address;
73
74 struct {
75 struct sockaddr_in address;
76 char *hostname;
77 unsigned int program;
78 unsigned int version;
79 unsigned short port;
80 int protocol;
81 } mount_server;
82
83 struct {
84 struct sockaddr_in address;
85 char *hostname;
86 char *export_path;
87 unsigned int program;
88 int protocol;
89 } nfs_server;
90};
91
92enum { 61enum {
93 /* Mount options that take no arguments */ 62 /* Mount options that take no arguments */
94 Opt_soft, Opt_hard, 63 Opt_soft, Opt_hard,