summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnand Avati <avati@gluster.com>2011-04-28 01:08:32 +0000
committerAnand Avati <avati@gluster.com>2011-04-29 04:24:33 -0700
commit77f485dc30e5cd81d63cb7a92dc77b3ace69d40d (patch)
tree93d84827b8d81cfe302f71ad8940b6c0a2cd41f0
parent28cea0ebbd4ce4cd64e1da4e43512230a0050ee9 (diff)
marker: fix NULL deref in loggingv3.2.0
Fix bad gf_log argument Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2852 (Glusterfsd crashes on AMI) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2852
-rw-r--r--xlators/features/marker/src/marker.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c
index 8ab66f4..041449b 100644
--- a/xlators/features/marker/src/marker.c
+++ b/xlators/features/marker/src/marker.c
@@ -1589,8 +1589,9 @@ marker_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
if (op_ret == -1) {
gf_log (this->name, ((op_errno == ENOENT) ? GF_LOG_DEBUG :
GF_LOG_ERROR),
- "%s occured while creating symlinks for %s",
- strerror (op_errno), local->loc.path);
+ "%s occured during setattr of %s",
+ strerror (op_errno),
+ (local ? local->loc.path : "<nul>"));
}
STACK_UNWIND_STRICT (setattr, frame, op_ret, op_errno, statpre,