Change rpc_nfs_readdirplus to rpc_nfs3_readdirplus

[deb_libnfs.git] / lib / libnfs.c

diff --git a/lib/libnfs.c b/lib/libnfs.c
index e916e753f5aee67e601826511c174fad657fc293..d092c36c469e8731d2e3663cdcbcae0208ecb82e 100644 (file)
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -2533,7 +2533,14 @@ static void nfs_opendir2_cb(struct rpc_context *rpc, int status, void *command_d
        }
 
        if (res->READDIR3res_u.resok.reply.eof == 0) {
-               if (rpc_nfs_readdir_async(nfs->rpc, nfs_opendir2_cb, &data->fh, cookie, res->READDIR3res_u.resok.cookieverf, 8192, data) != 0) {
+               READDIR3args args;
+
+               args.dir = data->fh;
+               args.cookie = cookie;
+               memcpy(&args.cookieverf, res->READDIR3res_u.resok.cookieverf, sizeof(cookieverf3)); 
+               args.count = 8192;
+
+               if (rpc_nfs3_readdir_async(nfs->rpc, nfs_opendir2_cb, &args, data) != 0) {
                        rpc_set_error(nfs->rpc, "RPC error: Failed to send READDIR call for %s", data->path);
                        data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
                        nfs_free_nfsdir(nfsdir);
@@ -2601,9 +2608,14 @@ static void nfs_opendir_cb(struct rpc_context *rpc, int status, void *command_da
        assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
        if (status == RPC_STATUS_ERROR || (status == RPC_STATUS_SUCCESS && res->status == NFS3ERR_NOTSUPP) ){
-               cookieverf3 cv;
+               READDIR3args args;
 
-               if (rpc_nfs_readdir_async(nfs->rpc, nfs_opendir2_cb, &data->fh, 0, (char *)&cv, 8192, data) != 0) {
+               args.dir = data->fh;
+               args.cookie = cookie;
+               memset(&args.cookieverf, 0, sizeof(cookieverf3)); 
+               args.count = 8192;
+
+               if (rpc_nfs3_readdir_async(nfs->rpc, nfs_opendir2_cb, &args, data) != 0) {
                        rpc_set_error(nfs->rpc, "RPC error: Failed to send READDIR call for %s", data->path);
                        data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
                        nfs_free_nfsdir(nfsdir);
@@ -2674,7 +2686,15 @@ static void nfs_opendir_cb(struct rpc_context *rpc, int status, void *command_da
        }
 
        if (res->READDIRPLUS3res_u.resok.reply.eof == 0) {
-               if (rpc_nfs_readdirplus_async(nfs->rpc, nfs_opendir_cb, &data->fh, cookie, res->READDIRPLUS3res_u.resok.cookieverf, 8192, data) != 0) {
+               READDIRPLUS3args args;
+
+               args.dir = data->fh;
+               args.cookie = cookie;
+               memcpy(&args.cookieverf, res->READDIRPLUS3res_u.resok.cookieverf, sizeof(cookieverf3));
+               args.dircount = 8192;
+               args.maxcount = 8192;
+
+               if (rpc_nfs3_readdirplus_async(nfs->rpc, nfs_opendir_cb, &args, data) != 0) {
                        rpc_set_error(nfs->rpc, "RPC error: Failed to send READDIRPLUS call for %s", data->path);
                        data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
                        nfs_free_nfsdir(nfsdir);
@@ -2695,10 +2715,14 @@ static void nfs_opendir_cb(struct rpc_context *rpc, int status, void *command_da
 
 static int nfs_opendir_continue_internal(struct nfs_context *nfs, struct nfs_cb_data *data)
 {
-       cookieverf3 cv;
+       READDIRPLUS3args args;
 
-       memset(cv, 0, sizeof(cookieverf3));
-       if (rpc_nfs_readdirplus_async(nfs->rpc, nfs_opendir_cb, &data->fh, 0, (char *)&cv, 8192, data) != 0) {
+       args.dir = data->fh;
+       args.cookie = 0;
+       memset(&args.cookieverf, 0, sizeof(cookieverf3));
+       args.dircount = 8192;
+       args.maxcount = 8192;
+       if (rpc_nfs3_readdirplus_async(nfs->rpc, nfs_opendir_cb, &args, data) != 0) {
                rpc_set_error(nfs->rpc, "RPC error: Failed to send READDIRPLUS call for %s", data->path);
                data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
                free_nfs_cb_data(data);
@@ -2952,7 +2976,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 +3510,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);
@@ -3623,13 +3647,18 @@ static void nfs_rename_cb(struct rpc_context *rpc, int status, void *command_dat
 static int nfs_rename_continue_2_internal(struct nfs_context *nfs, struct nfs_cb_data *data)
 {
        struct nfs_rename_data *rename_data = data->continue_data;
+       RENAME3args args;
 
        /* steal the filehandle */
        rename_data->newdir.data.data_len = data->fh.data.data_len;
        rename_data->newdir.data.data_val = data->fh.data.data_val;
        data->fh.data.data_val = NULL;
 
-       if (rpc_nfs_rename_async(nfs->rpc, nfs_rename_cb, &rename_data->olddir, rename_data->oldobject, &rename_data->newdir, rename_data->newobject, data) != 0) {
+       args.from.dir = rename_data->olddir;
+       args.from.name = rename_data->oldobject;
+       args.to.dir = rename_data->newdir;
+       args.to.name = rename_data->newobject;
+       if (rpc_nfs3_rename_async(nfs->rpc, nfs_rename_cb, &args, data) != 0) {
                rpc_set_error(nfs->rpc, "RPC error: Failed to send RENAME call for %s", data->path);
                data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
                free_nfs_cb_data(data);
@@ -3781,13 +3810,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);