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>

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 76cf55d57101ab5b2cf3acfac638684e27bb6543..9c2d0fbb9f8973f22385a9b270c131fa56680683 100644 (file)
--- 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 a955821b84999c20768baff6eef48c1c125fb763..2fd28c4df1d4d2740223650bddde49a23e4e8e96 100644 (file)
--- 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,