summaryrefslogtreecommitdiffstats
path: root/fs/nfs/client.c
diff options
context:
space:
mode:
authorWeston Andros Adamson2013-10-18 21:15:16 +0200
committerTrond Myklebust2013-10-28 20:36:58 +0100
commita3f73c27afff9590a4432879b7145289cb89cf0a (patch)
tree6d010e25f69bbcee77e22285b280a5f446add578 /fs/nfs/client.c
parentNFSv4: make nfs_find_best_sec static (diff)
downloadkernel-qcow2-linux-a3f73c27afff9590a4432879b7145289cb89cf0a.tar.gz
kernel-qcow2-linux-a3f73c27afff9590a4432879b7145289cb89cf0a.tar.xz
kernel-qcow2-linux-a3f73c27afff9590a4432879b7145289cb89cf0a.zip
NFS: separate passed security flavs from selected
When filling parsed_mount_data, store the parsed sec= mount option in the new struct nfs_auth_info and the chosen flavor in selected_flavor. This patch lays the groundwork for supporting multiple sec= options. Signed-off-by: Weston Andros Adamson <dros@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/client.c')
-rw-r--r--fs/nfs/client.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 692fd0e9362f..f5a7f7f9cd59 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -787,7 +787,8 @@ static int nfs_init_server(struct nfs_server *server,
server->port = data->nfs_server.port;
- error = nfs_init_server_rpcclient(server, &timeparms, data->auth_flavors[0]);
+ error = nfs_init_server_rpcclient(server, &timeparms,
+ data->selected_flavor);
if (error < 0)
goto error;