diff options
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index f6d480af84a..9db61731b62 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -6424,6 +6424,13 @@ list: } done: + if ((op_ret == 0) && op_errno != ENOENT) { + /* remaining buffer size is not enough to hold even one + * dentry + */ + goto unwind; + } + if ((count == 0) || (local && (local->filled < local->size))) { if ((next_offset == 0) || (op_errno == ENOENT)) { next_offset = 0; @@ -6454,8 +6461,8 @@ done: STACK_WIND_COOKIE (frame, dht_readdirp_cbk, next_subvol, next_subvol, next_subvol->fops->readdirp, - local->fd, local->size, next_offset, - local->xattr); + local->fd, (local->size - local->filled), + next_offset, local->xattr); return 0; } @@ -6545,6 +6552,13 @@ dht_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, } done: + if ((op_ret == 0) && op_errno != ENOENT) { + /* remaining buffer size is not enough to hold even one + * dentry + */ + goto unwind; + } + if ((count == 0) || (local && (local->filled < local->size))) { if ((op_ret <= 0) || (op_errno == ENOENT)) { next_subvol = dht_subvol_next (this, prev); @@ -6558,7 +6572,8 @@ done: STACK_WIND_COOKIE (frame, dht_readdir_cbk, next_subvol, next_subvol, next_subvol->fops->readdir, - local->fd, local->size, next_offset, NULL); + local->fd, (local->size - local->filled), + next_offset, NULL); return 0; } |