diff options
| author | shishir gowda <shishirng@gluster.com> | 2012-02-23 12:24:08 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-02-22 23:19:10 -0800 |
| commit | 7820f7563aff8e1a5e73eb75adc387635a301b6e (patch) | |
| tree | 74894d48448cb4886c44ad9230e41c7e3b8866b2 | |
| parent | 52904f0d416aedf61fcebe2e5051bfa92999c6e4 (diff) | |
protocol/client: Pass correct dict in client_readdirp
Also, alloc entry->dict before calling unserialize to it.
Change-Id: I8a9db93afd6e95e75307467cd654805780d7b467
BUG: 796534
Signed-off-by: shishir gowda <shishirng@gluster.com>
Reviewed-on: http://review.gluster.com/2803
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
| -rw-r--r-- | xlators/protocol/client/src/client-helpers.c | 2 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/xlators/protocol/client/src/client-helpers.c b/xlators/protocol/client/src/client-helpers.c index 4c1ac1baa5c..f1c7c71cd2b 100644 --- a/xlators/protocol/client/src/client-helpers.c +++ b/xlators/protocol/client/src/client-helpers.c @@ -190,6 +190,8 @@ unserialize_rsp_direntp (xlator_t *this, fd_t *fd, if (!buf) goto out; + entry->dict = dict_new (); + ret = dict_unserialize (buf, trav->dict.dict_len, &entry->dict); if (ret < 0) { diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c index 9a494522716..d93a99cff6e 100644 --- a/xlators/protocol/client/src/client.c +++ b/xlators/protocol/client/src/client.c @@ -1792,7 +1792,7 @@ client_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd, args.fd = fd; args.size = size; args.offset = off; - args.xattr_req = dict; + args.dict = dict; proc = &conf->fops->proctable[GF_FOP_READDIRP]; if (!proc) { |