From: Ronnie Sahlberg Date: Tue, 31 Dec 2013 23:20:28 +0000 (-0800) Subject: Change rpc_nfs_rmdir to rpc_nfs3_rmdir X-Git-Tag: upstream/1.9.6^2~148 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=bf817ee6942c488d0b41aede1074bf831ed8e316;p=deb_libnfs.git Change rpc_nfs_rmdir to rpc_nfs3_rmdir --- diff --git a/lib/libnfs.c b/lib/libnfs.c index 1e67185..cf9ad13 100644 --- a/lib/libnfs.c +++ b/lib/libnfs.c @@ -1973,10 +1973,13 @@ static void nfs_rmdir_cb(struct rpc_context *rpc, int status, void *command_data static int nfs_rmdir_continue_internal(struct nfs_context *nfs, struct nfs_cb_data *data) { char *str = data->continue_data; - + RMDIR3args args; + str = &str[strlen(str) + 1]; - if (rpc_nfs_rmdir_async(nfs->rpc, nfs_rmdir_cb, &data->fh, str, data) != 0) { + args.object.dir = data->fh; + args.object.name = str; + if (rpc_nfs3_rmdir_async(nfs->rpc, nfs_rmdir_cb, &args, data) != 0) { rpc_set_error(nfs->rpc, "RPC error: Failed to send RMDIR call for %s", data->path); data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data); free_nfs_cb_data(data);