summaryrefslogtreecommitdiff
path: root/fs/nfs/super.c
diff options
context:
space:
mode:
authorBryan Schumaker <bjschuma@netapp.com>2012-07-30 16:05:19 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-07-30 19:05:54 -0400
commit1179acc6a3e260bc4edc74fa94f6c7908290eaec (patch)
treef84a56e4cc1ea6347383b29c83df19eae05eea0f /fs/nfs/super.c
parentff9099f26645818563c8d396a154c2ce6ee422eb (diff)
downloadlinux-3.10-1179acc6a3e260bc4edc74fa94f6c7908290eaec.tar.gz
linux-3.10-1179acc6a3e260bc4edc74fa94f6c7908290eaec.tar.bz2
linux-3.10-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/super.c')
-rw-r--r--fs/nfs/super.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 5fca59d73e4..a5f9fb3bfdc 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1664,7 +1664,7 @@ struct dentry *nfs_try_mount(int flags, const char *dev_name,
}
/* Get a volume representation */
- server = nfs_create_server(mount_info->parsed, mount_info->mntfh, nfs_mod);
+ server = nfs_mod->rpc_ops->create_server(mount_info, nfs_mod);
if (IS_ERR(server))
return ERR_CAST(server);
@@ -2458,7 +2458,7 @@ nfs_xdev_mount(struct file_system_type *fs_type, int flags,
mount_info.mntfh = mount_info.cloned->fh;
/* create a new volume representation */
- server = nfs_clone_server(NFS_SB(data->sb), data->fh, data->fattr, data->authflavor);
+ server = nfs_mod->rpc_ops->clone_server(NFS_SB(data->sb), data->fh, data->fattr, data->authflavor);
if (IS_ERR(server)) {
error = PTR_ERR(server);
goto out_err;