diff options
| author | Pranith Kumar K <pranithk@gluster.com> | 2012-02-02 19:17:12 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-02-22 04:14:32 -0800 |
| commit | 064bd0f25a02bd65e32a1c03bfb124340dd60651 (patch) | |
| tree | c2822643db1435fa02337221cc9bee9279443e2f /xlators | |
| parent | 2b52b096a7db3124fdd97554e63792f36e889af9 (diff) | |
cluster/afr: Don't trust the fd returned in open_cbk
Change-Id: Id7d85a38875e3675904fc134e54e723c6a0c4de2
BUG: 786766
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Reviewed-on: http://review.gluster.com/2792
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/cluster/afr/src/afr-open.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/xlators/cluster/afr/src/afr-open.c b/xlators/cluster/afr/src/afr-open.c index 739def351ce..a203a36f920 100644 --- a/xlators/cluster/afr/src/afr-open.c +++ b/xlators/cluster/afr/src/afr-open.c @@ -317,6 +317,7 @@ afr_openfd_fix_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int child_index = (long) cookie; struct list_head paused_calls = {0}; gf_boolean_t fop_paused = _gf_false; + fd_t *local_fd = NULL; priv = this->private; local = frame->local; @@ -328,18 +329,19 @@ afr_openfd_fix_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this, priv->children[child_index]->name); } + local_fd = fd_ref (local->fd); call_count = afr_frame_return (frame); //Note: Do not access any thing using the frame outside call_count 0 //Note: No frame locking needed for this block of code - fd_ctx = afr_fd_ctx_get (fd, this); + fd_ctx = afr_fd_ctx_get (local_fd, this); if (!fd_ctx) { gf_log (this->name, GF_LOG_WARNING, - "failed to get fd context, %p", fd); + "failed to get fd context, %p", local_fd); goto out; } - LOCK (&fd->lock); + LOCK (&local_fd->lock); { if (op_ret >= 0) { fd_ctx->opened_on[child_index] = AFR_FD_OPENED; @@ -351,7 +353,7 @@ afr_openfd_fix_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this, afr_get_resumable_calls (this, fd_ctx, &paused_calls); } } - UNLOCK (&fd->lock); + UNLOCK (&local_fd->lock); out: if (call_count == 0) { afr_resume_calls (this, &paused_calls); @@ -366,6 +368,7 @@ out: } done: + fd_unref (local_fd); return 0; } |