repositories
/
deb_libnfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a64a16a
)
Change rpc_nfs_readdirplus to rpc_nfs3_readdirplus
author
Ronnie Sahlberg
<ronniesahlberg@gmail.com>
Tue, 31 Dec 2013 23:58:59 +0000
(15:58 -0800)
committer
Ronnie Sahlberg
<ronniesahlberg@gmail.com>
Tue, 31 Dec 2013 23:58:59 +0000
(15:58 -0800)
lib/libnfs.c
patch
|
blob
|
blame
|
history
diff --git
a/lib/libnfs.c
b/lib/libnfs.c
index 59f19890d228edfba6988c7393f640aa599aa3a1..d092c36c469e8731d2e3663cdcbcae0208ecb82e 100644
(file)
--- a/
lib/libnfs.c
+++ b/
lib/libnfs.c
@@
-2686,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 (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);
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);
@@
-2707,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)
{
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);
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);