summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Bellur <vijay@gluster.com>2010-03-11 04:11:17 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-03-11 02:19:43 -0800
commite6bb22238a9c920e4a4373da1d9c756884543028 (patch)
tree097ad0ffbc07d5871030f8ddea84a20f79c64b26
parente66adead7078163cd9d9c0bbd8ec6289b4e4ea35 (diff)
protocol/server: Do gf_flock to flock conversion at the right place
Signed-off-by: Vijay Bellur <vijay@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 708 (solaris : ping pong test hangs) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=708
-rw-r--r--xlators/protocol/server/src/server-protocol.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xlators/protocol/server/src/server-protocol.c b/xlators/protocol/server/src/server-protocol.c
index 608b31513..4562eaea3 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);