From 7edc9026db94f488f04e7a76bf332f1feabcc9aa Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Thu, 12 Jan 2012 16:02:32 +1100 Subject: [PATCH] make mkdir_async take a full MKDIR3args argument --- include/libnfs-raw.h | 3 ++- lib/libnfs.c | 12 ++++++++++-- nfs/nfs.c | 12 ++---------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/include/libnfs-raw.h b/include/libnfs-raw.h index df940c5..3deffc8 100644 --- a/include/libnfs-raw.h +++ b/include/libnfs-raw.h @@ -414,7 +414,8 @@ int rpc_nfs_setattr_async(struct rpc_context *rpc, rpc_cb cb, struct SETATTR3arg * RPC_STATUS_CANCEL : The connection attempt was aborted before it could complete. * data is NULL. */ -int rpc_nfs_mkdir_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, char *dir, void *private_data); +struct MKDIR3args; +int rpc_nfs_mkdir_async(struct rpc_context *rpc, rpc_cb cb, struct MKDIR3args *args, void *private_data); diff --git a/lib/libnfs.c b/lib/libnfs.c index 8fe84b8..3c150ac 100644 --- a/lib/libnfs.c +++ b/lib/libnfs.c @@ -1436,10 +1436,18 @@ static void nfs_mkdir_cb(struct rpc_context *rpc _U_, int status, void *command_ static int nfs_mkdir_continue_internal(struct nfs_context *nfs, struct nfs_cb_data *data) { char *str = data->continue_data; - + MKDIR3args args; + str = &str[strlen(str) + 1]; - if (rpc_nfs_mkdir_async(nfs->rpc, nfs_mkdir_cb, &data->fh, str, data) != 0) { + memset(&args, 0, sizeof(MKDIR3args)); + 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 = str; + args.attributes.mode.set_it = 1; + args.attributes.mode.set_mode3_u.mode = 0755; + + if (rpc_nfs_mkdir_async(nfs->rpc, nfs_mkdir_cb, &args, data) != 0) { rpc_set_error(nfs->rpc, "RPC error: Failed to send MKDIR call for %s", data->path); data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data); free_nfs_cb_data(data); diff --git a/nfs/nfs.c b/nfs/nfs.c index ccbd2c1..099e291 100644 --- a/nfs/nfs.c +++ b/nfs/nfs.c @@ -342,10 +342,9 @@ int rpc_nfs_setattr_async(struct rpc_context *rpc, rpc_cb cb, SETATTR3args *args -int rpc_nfs_mkdir_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, char *dir, void *private_data) +int rpc_nfs_mkdir_async(struct rpc_context *rpc, rpc_cb cb, MKDIR3args *args, void *private_data) { struct rpc_pdu *pdu; - MKDIR3args args; pdu = rpc_allocate_pdu(rpc, NFS_PROGRAM, NFS_V3, NFS3_MKDIR, cb, private_data, (xdrproc_t)xdr_MKDIR3res, sizeof(MKDIR3res)); if (pdu == NULL) { @@ -353,14 +352,7 @@ int rpc_nfs_mkdir_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, return -1; } - memset(&args, 0, sizeof(MKDIR3args)); - args.where.dir.data.data_len = fh->data.data_len; - args.where.dir.data.data_val = fh->data.data_val; - args.where.name = dir; - args.attributes.mode.set_it = 1; - args.attributes.mode.set_mode3_u.mode = 0755; - - if (xdr_MKDIR3args(&pdu->xdr, &args) == 0) { + if (xdr_MKDIR3args(&pdu->xdr, args) == 0) { rpc_set_error(rpc, "XDR error: Failed to encode MKDIR3args"); rpc_free_pdu(rpc, pdu); return -2; -- 2.34.1