Skip to content

Commit

Permalink
NFS: move nfs_parsed_mount_data structure definition
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
\"Talpey, Thomas\ authored and Trond Myklebust committed Oct 9, 2007
1 parent 4417c8c commit 6b18eaa
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 31 deletions.
33 changes: 33 additions & 0 deletions fs/nfs/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
31 changes: 0 additions & 31 deletions fs/nfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 6b18eaa

Please sign in to comment.