From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Tue, 31 Dec 2013 23:06:25 +0000 (-0800)
Subject: Change all calls to rpc_nfs_fsinfo to rpc_nfs3_fsinfo
X-Git-Tag: upstream/1.9.6^2~153
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=c4ba61c51ccaee6515c5f34b784fc461106574c0;p=deb_libnfs.git

Change all calls to rpc_nfs_fsinfo to rpc_nfs3_fsinfo
---

diff --git a/examples/nfsclient-raw.c b/examples/nfsclient-raw.c
index 80a38f0..28dd45c 100644
--- a/examples/nfsclient-raw.c
+++ b/examples/nfsclient-raw.c
@@ -85,7 +85,7 @@ void rquota_connect_cb(struct rpc_context *rpc, int status, void *data _U_, void
 	printf("Connected to RPC.RQUOTAD on %s:%d\n", client->server, client->rquota_port);
 	printf("Send GETQUOTA request for uid 100\n");
 	if (rpc_rquota1_getquota_async(rpc, rquota_getquota_cb, EXPORT, 100, client) != 0) {
-		printf("Failed to send fsinfo request\n");
+		printf("Failed to send getquota request\n");
 		exit(10);
 	}
 }
@@ -170,6 +170,7 @@ void nfs_fsinfo_cb(struct rpc_context *rpc _U_, int status, void *data, void *pr
 void nfs_connect_cb(struct rpc_context *rpc, int status, void *data _U_, void *private_data)
 {
 	struct client *client = private_data;
+	struct FSINFO3args args;
 
 	if (status != RPC_STATUS_SUCCESS) {
 		printf("connection to RPC.MOUNTD on server %s failed\n", client->server);
@@ -178,7 +179,8 @@ void nfs_connect_cb(struct rpc_context *rpc, int status, void *data _U_, void *p
 
 	printf("Connected to RPC.NFSD on %s:%d\n", client->server, client->mount_port);
 	printf("Send FSINFO request\n");
-	if (rpc_nfs_fsinfo_async(rpc, nfs_fsinfo_cb, &client->rootfh, client) != 0) {
+	args.fsroot = client->rootfh;
+	if (rpc_nfs3_fsinfo_async(rpc, nfs_fsinfo_cb, &args, client) != 0) {
 		printf("Failed to send fsinfo request\n");
 		exit(10);
 	}
diff --git a/lib/libnfs.c b/lib/libnfs.c
index 029c9c9..6a70f4b 100644
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -610,6 +610,7 @@ static void nfs_mount_8_cb(struct rpc_context *rpc, int status, void *command_da
 {
 	struct nfs_cb_data *data = private_data;
 	struct nfs_context *nfs = data->nfs;
+	struct FSINFO3args args;
 
 	assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
@@ -624,7 +625,8 @@ static void nfs_mount_8_cb(struct rpc_context *rpc, int status, void *command_da
 		return;
 	}
 
-	if (rpc_nfs_fsinfo_async(rpc, nfs_mount_9_cb, &nfs->rootfh, data) != 0) {
+	args.fsroot = nfs->rootfh;
+	if (rpc_nfs3_fsinfo_async(rpc, nfs_mount_9_cb, &args, data) != 0) {
 		data->cb(-ENOMEM, nfs, command_data, data->private_data);
 		free_nfs_cb_data(data);
 		return;