diff options
| author | Bryan Schumaker | 2012-07-30 22:05:19 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2012-07-31 01:05:54 +0200 |
| commit | 1179acc6a3e260bc4edc74fa94f6c7908290eaec (patch) | |
| tree | f84a56e4cc1ea6347383b29c83df19eae05eea0f /fs/nfs/nfs4client.c | |
| parent | NFS: Create a try_mount rpc op (diff) | |
| download | kernel-qcow2-linux-1179acc6a3e260bc4edc74fa94f6c7908290eaec.tar.gz kernel-qcow2-linux-1179acc6a3e260bc4edc74fa94f6c7908290eaec.tar.xz kernel-qcow2-linux-1179acc6a3e260bc4edc74fa94f6c7908290eaec.zip | |
NFS: Only initialize the ACL client in the v3 case
v2 and v4 don't use it, so I create two new nfs_rpc_ops functions to
initialize the ACL client only when we are using v3.
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4client.c')
| -rw-r--r-- | fs/nfs/nfs4client.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 769e798b3959..b2d409d2805a 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -574,8 +574,10 @@ error: * Create a version 4 volume record * - keyed on server and FSID */ -struct nfs_server *nfs4_create_server(const struct nfs_parsed_mount_data *data, - struct nfs_fh *mntfh) +/*struct nfs_server *nfs4_create_server(const struct nfs_parsed_mount_data *data, + struct nfs_fh *mntfh)*/ +struct nfs_server *nfs4_create_server(struct nfs_mount_info *mount_info, + struct nfs_subversion *nfs_mod) { struct nfs_server *server; int error; @@ -587,11 +589,11 @@ struct nfs_server *nfs4_create_server(const struct nfs_parsed_mount_data *data, return ERR_PTR(-ENOMEM); /* set up the general RPC client */ - error = nfs4_init_server(server, data); + error = nfs4_init_server(server, mount_info->parsed); if (error < 0) goto error; - error = nfs4_server_common_setup(server, mntfh); + error = nfs4_server_common_setup(server, mount_info->mntfh); if (error < 0) goto error; |