diff options
| author | Mohammed Junaid <junaid@redhat.com> | 2012-04-25 15:39:20 +0530 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-05-15 16:53:28 -0700 |
| commit | 4b94890c9777e7d78881d6c72ff739c91a9d3e99 (patch) | |
| tree | aa069deb806cf21c4fe8f8fcd7fe2151952ce25d | |
| parent | fd3d555dea7c151265ca252d3c55129ba3fcdbb6 (diff) | |
mount/fuse: Use state->lk_lock to print lock information on EAGAIN.
Change-Id: I24a4a0b1c8dc0b8e08b380a5bc8efc111ccdb2c3
BUG: 808400
Signed-off-by: Mohammed Junaid <junaid@redhat.com>
Reviewed-on: http://review.gluster.com/3227
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
| -rw-r--r-- | xlators/mount/fuse/src/fuse-bridge.c | 7 | ||||
| -rw-r--r-- | xlators/performance/quick-read/src/quick-read.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index e2cdbe14112..f14ccf5c178 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -3186,11 +3186,10 @@ fuse_setlk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, gf_log ("glusterfs-fuse", GF_LOG_DEBUG, "Returning EAGAIN Flock: " "start=%llu, len=%llu, pid=%llu, lk-owner=%s", - (unsigned long long) lock->l_start, - (unsigned long long) lock->l_len, - (unsigned long long) lock->l_pid, + (unsigned long long) state->lk_lock.l_start, + (unsigned long long) state->lk_lock.l_len, + (unsigned long long) state->lk_lock.l_pid, lkowner_utoa (&frame->root->lk_owner)); - } else { gf_log ("glusterfs-fuse", GF_LOG_WARNING, "%"PRIu64": ERR => -1 (%s)", diff --git a/xlators/performance/quick-read/src/quick-read.c b/xlators/performance/quick-read/src/quick-read.c index 6e0aa7cddd7..ef980a5898a 100644 --- a/xlators/performance/quick-read/src/quick-read.c +++ b/xlators/performance/quick-read/src/quick-read.c @@ -3051,7 +3051,7 @@ qr_lk_helper (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t cmd, return 0; unwind: - QR_STACK_UNWIND (lk, frame, -1, op_errno, NULL, NULL); + QR_STACK_UNWIND (lk, frame, -1, op_errno, lock, xdata); return 0; } |