diff options
| author | Kaushal M <kaushal@redhat.com> | 2012-05-15 16:31:55 +0530 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-05-17 09:19:32 -0700 |
| commit | 99ac60193a31438258b751e4c99c85d153ddaae5 (patch) | |
| tree | 197c2b50c72748b76e48a429d7cc9f421fb9fdfa | |
| parent | ab12e305fcd303972c17e8b9e777cc1482aadf37 (diff) | |
client/protocol : Changes in client3_1_getxattr()
Backporting change 1d02db63ae from master.
Copy args->loc to local->loc in client3_1_getxattr(). This prevents logs with
"(null) (--)" in client3_1_getxattr_cbk().
Also save args->name in local->name and print it in the log as well.
Also, fixes crashes caused by above patch in master. (trying to gf_strdup a NULL
args->name)
BUG: 812199
Change-Id: I5419f6a244de93dd1a96ac8e229be3ecdc9f456e
Signed-off-by: Kaushal M <kaushal@redhat.com>
Reviewed-on: http://review.gluster.com/3350
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
| -rw-r--r-- | xlators/protocol/client/src/client-helpers.c | 4 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client.h | 1 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client3_1-fops.c | 9 |
3 files changed, 12 insertions, 2 deletions
diff --git a/xlators/protocol/client/src/client-helpers.c b/xlators/protocol/client/src/client-helpers.c index 70dfeba8c1a..3efadeae265 100644 --- a/xlators/protocol/client/src/client-helpers.c +++ b/xlators/protocol/client/src/client-helpers.c @@ -132,6 +132,10 @@ client_local_wipe (clnt_local_t *local) iobref_unref (local->iobref); } + if (local->name) { + GF_FREE (local->name); + } + mem_put (local); } diff --git a/xlators/protocol/client/src/client.h b/xlators/protocol/client/src/client.h index bf04f942a39..64066dd0add 100644 --- a/xlators/protocol/client/src/client.h +++ b/xlators/protocol/client/src/client.h @@ -155,6 +155,7 @@ typedef struct client_local { int32_t cmd; struct list_head lock_list; pthread_mutex_t mutex; + char *name; } clnt_local_t; typedef struct client_args { diff --git a/xlators/protocol/client/src/client3_1-fops.c b/xlators/protocol/client/src/client3_1-fops.c index dcf688a0e9f..c4164a95b21 100644 --- a/xlators/protocol/client/src/client3_1-fops.c +++ b/xlators/protocol/client/src/client3_1-fops.c @@ -1051,11 +1051,12 @@ out: if (rsp.op_ret == -1) { gf_log (this->name, ((op_errno == ENOTSUP) ? GF_LOG_DEBUG : GF_LOG_WARNING), - "remote operation failed: %s. Path: %s (%s)", + "remote operation failed: %s. Path: %s (%s). Key: %s", strerror (op_errno), (local) ? local->loc.path : "--", (local && local->loc.inode) ? - uuid_utoa (local->loc.inode->gfid) : "--"); + uuid_utoa (local->loc.inode->gfid) : "--", + (local) ? local->name : "(null)"); } CLIENT_STACK_UNWIND (getxattr, frame, rsp.op_ret, op_errno, dict, xdata); @@ -4635,6 +4636,10 @@ client3_1_getxattr (call_frame_t *frame, xlator_t *this, op_errno = ENOMEM; goto unwind; } + + loc_copy (&local->loc, args->loc); + if (args->name) + local->name = gf_strdup (args->name); frame->local = local; rsp_iobref = iobref_new (); |