diff options
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: | |||
574 | * Create a version 4 volume record | 574 | * Create a version 4 volume record |
575 | * - keyed on server and FSID | 575 | * - keyed on server and FSID |
576 | */ | 576 | */ |
577 | struct nfs_server *nfs4_create_server(const struct nfs_parsed_mount_data *data, | 577 | /*struct nfs_server *nfs4_create_server(const struct nfs_parsed_mount_data *data, |
578 | struct nfs_fh *mntfh) | 578 | struct nfs_fh *mntfh)*/ |
579 | struct nfs_server *nfs4_create_server(struct nfs_mount_info *mount_info, | ||
580 | struct nfs_subversion *nfs_mod) | ||
579 | { | 581 | { |
580 | struct nfs_server *server; | 582 | struct nfs_server *server; |
581 | int error; | 583 | int error; |
@@ -587,11 +589,11 @@ struct nfs_server *nfs4_create_server(const struct nfs_parsed_mount_data *data, | |||
587 | return ERR_PTR(-ENOMEM); | 589 | return ERR_PTR(-ENOMEM); |
588 | 590 | ||
589 | /* set up the general RPC client */ | 591 | /* set up the general RPC client */ |
590 | error = nfs4_init_server(server, data); | 592 | error = nfs4_init_server(server, mount_info->parsed); |
591 | if (error < 0) | 593 | if (error < 0) |
592 | goto error; | 594 | goto error; |
593 | 595 | ||
594 | error = nfs4_server_common_setup(server, mntfh); | 596 | error = nfs4_server_common_setup(server, mount_info->mntfh); |
595 | if (error < 0) | 597 | if (error < 0) |
596 | goto error; | 598 | goto error; |
597 | 599 | ||