diff options
| author | Vikas Gorur <vikas@gluster.com> | 2009-12-01 06:11:06 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2009-12-01 06:30:07 -0800 |
| commit | 85ed82893aca7dd6307100660b9bba0233d52240 (patch) | |
| tree | bf54bd1c7ad5d713f74c212cc1dbaa30d752dbc4 /xlators/cluster/afr/src/afr-dir-read.c | |
| parent | cc57da87504621655d4acb7ec65e27f45b2b72d1 (diff) | |
cluster/afr: Don't do memcpy of afr_local_t in afr_local_copy.
For the background self-heal frame's local_t, copy only
required members --- not a wholesale memcpy. The memcpy
lead to pointers being copied and then double free'd.
Signed-off-by: Vikas Gorur <vikas@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 320 (Improve self-heal performance)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=320
Diffstat (limited to 'xlators/cluster/afr/src/afr-dir-read.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-dir-read.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/xlators/cluster/afr/src/afr-dir-read.c b/xlators/cluster/afr/src/afr-dir-read.c index 24227c33b51..fab60b66ef7 100644 --- a/xlators/cluster/afr/src/afr-dir-read.c +++ b/xlators/cluster/afr/src/afr-dir-read.c @@ -59,9 +59,6 @@ afr_examine_dir_sh_unwind (call_frame_t *frame, xlator_t *this) afr_set_opendir_done (this, local->fd->inode); - /* let self-heal's local cleanup free this */ - local->cont.opendir.checksum = NULL; - AFR_STACK_UNWIND (opendir, frame, local->op_ret, local->op_errno, local->fd); @@ -153,11 +150,6 @@ out: if (__checksums_differ (local->cont.opendir.checksum, priv->child_count)) { - /* self-heal will call AFR_STACK_DESTROY and - thus unref local->fd, so ref it here */ - - local->fd = fd_ref (local->fd); - sh->need_entry_self_heal = _gf_true; sh->forced_merge = _gf_true; sh->mode = local->fd->inode->st_mode; |