From e6bb22238a9c920e4a4373da1d9c756884543028 Mon Sep 17 00:00:00 2001 From: Vijay Bellur Date: Thu, 11 Mar 2010 04:11:17 +0000 Subject: protocol/server: Do gf_flock to flock conversion at the right place Signed-off-by: Vijay Bellur Signed-off-by: Anand V. Avati BUG: 708 (solaris : ping pong test hangs) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=708 --- xlators/protocol/server/src/server-protocol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xlators/protocol/server/src/server-protocol.c b/xlators/protocol/server/src/server-protocol.c index 608b3151..4562eaea 100644 --- a/xlators/protocol/server/src/server-protocol.c +++ b/xlators/protocol/server/src/server-protocol.c @@ -4938,6 +4938,8 @@ server_lk (call_frame_t *frame, xlator_t *bound_xl, break; } + gf_flock_to_flock (&req->flock, &state->flock); + switch (state->type) { case GF_LK_F_RDLCK: state->flock.l_type = F_RDLCK; @@ -4955,7 +4957,6 @@ server_lk (call_frame_t *frame, xlator_t *bound_xl, break; } - gf_flock_to_flock (&req->flock, &state->flock); resolve_and_resume (frame, server_lk_resume); -- cgit