X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs.c;h=af7dd0c55857215bec1153a9077134ca491bfde4;hb=7cd23ccc676f7438de933d55ba081d99b79bd735;hp=cdb709c86d9b89ff2a3d31e38dca89abc29cc8c7;hpb=5940c705a620fe2598e067d48f61bdc8b43f8e4a;p=deb_libnfs.git

diff --git a/lib/libnfs.c b/lib/libnfs.c
index cdb709c..af7dd0c 100644
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -2952,7 +2952,7 @@ static int nfs_readlink_continue_internal(struct nfs_context *nfs, struct nfs_cb
 	args.symlink.data.data_len = data->fh.data.data_len; 
 	args.symlink.data.data_val = data->fh.data.data_val; 
 
-	if (rpc_nfs_readlink_async(nfs->rpc, nfs_readlink_1_cb, &args, data) != 0) {
+	if (rpc_nfs3_readlink_async(nfs->rpc, nfs_readlink_1_cb, &args, data) != 0) {
 		rpc_set_error(nfs->rpc, "RPC error: Failed to send READLINK call for %s", data->path);
 		data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
 		free_nfs_cb_data(data);
@@ -3486,17 +3486,17 @@ static void nfs_symlink_cb(struct rpc_context *rpc, int status, void *command_da
 static int nfs_symlink_continue_internal(struct nfs_context *nfs, struct nfs_cb_data *data)
 {
 	struct nfs_symlink_data *symlink_data = data->continue_data;
-	SYMLINK3args sa;
+	SYMLINK3args args;
 
-	memset(&sa, 0, sizeof(SYMLINK3args));
-	sa.where.dir.data.data_len = data->fh.data.data_len;
-	sa.where.dir.data.data_val = data->fh.data.data_val;
-	sa.where.name = symlink_data->newpathobject;
-	sa.symlink.symlink_attributes.mode.set_it = 1;
-	sa.symlink.symlink_attributes.mode.set_mode3_u.mode = S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH;
-	sa.symlink.symlink_data = symlink_data->oldpath;
+	memset(&args, 0, sizeof(SYMLINK3args));
+	args.where.dir.data.data_len = data->fh.data.data_len;
+	args.where.dir.data.data_val = data->fh.data.data_val;
+	args.where.name = symlink_data->newpathobject;
+	args.symlink.symlink_attributes.mode.set_it = 1;
+	args.symlink.symlink_attributes.mode.set_mode3_u.mode = S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH;
+	args.symlink.symlink_data = symlink_data->oldpath;
 
-	if (rpc_nfs_symlink_async(nfs->rpc, nfs_symlink_cb, &sa, data) != 0) {
+	if (rpc_nfs3_symlink_async(nfs->rpc, nfs_symlink_cb, &args, data) != 0) {
 		rpc_set_error(nfs->rpc, "RPC error: Failed to send SYMLINK call for %s", data->path);
 		data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
 		free_nfs_cb_data(data);
@@ -3786,13 +3786,18 @@ static void nfs_link_cb(struct rpc_context *rpc, int status, void *command_data,
 static int nfs_link_continue_2_internal(struct nfs_context *nfs, struct nfs_cb_data *data)
 {
 	struct nfs_link_data *link_data = data->continue_data;
+	LINK3args args;
 
 	/* steal the filehandle */
 	link_data->newdir.data.data_len = data->fh.data.data_len;
 	link_data->newdir.data.data_val = data->fh.data.data_val;
 	data->fh.data.data_val = NULL;
 
-	if (rpc_nfs_link_async(nfs->rpc, nfs_link_cb, &link_data->oldfh, &link_data->newdir, link_data->newobject, data) != 0) {
+	memset(&args, 0, sizeof(LINK3args));
+	args.file = link_data->oldfh;
+	args.link.dir = link_data->newdir;
+	args.link.name = link_data->newobject;
+	if (rpc_nfs3_link_async(nfs->rpc, nfs_link_cb, &args, data) != 0) {
 		rpc_set_error(nfs->rpc, "RPC error: Failed to send LINK call for %s", data->path);
 		data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
 		free_nfs_cb_data(data);