summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Bellur <vijay@gluster.com>2010-03-11 04:13:08 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-03-11 02:19:52 -0800
commit789efde55345fe2bb252b5791d8df90fcb6c7e6b (patch)
tree4011c593a9da30b5daa9476854462ecf0ed83528
parent2d8fd85f728e4f715225cc3dac2110adb87dc5ad (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 608b3151358..4562eaea3ce 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);