From c686a46d1d9a2e0e3abd0b1eecb647f6afe53a3b Mon Sep 17 00:00:00 2001 From: Vijay Bellur Date: Thu, 11 Mar 2010 04:18:32 +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 6f7ecf9097b..f915717e3d5 100644 --- a/xlators/protocol/server/src/server-protocol.c +++ b/xlators/protocol/server/src/server-protocol.c @@ -6308,6 +6308,8 @@ server_lk (call_frame_t *frame, xlator_t *bound_xl, break; } + gf_flock_to_flock (&req->flock, &lock); + switch (state->type) { case GF_LK_F_RDLCK: lock.l_type = F_RDLCK; @@ -6325,7 +6327,6 @@ server_lk (call_frame_t *frame, xlator_t *bound_xl, break; } - gf_flock_to_flock (&req->flock, &lock); gf_log (BOUND_XL(frame)->name, GF_LOG_TRACE, "%"PRId64": LK \'fd=%"PRId64" (%"PRId64")\'", -- cgit