summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Bellur <vijay@gluster.com>2010-03-11 04:18:32 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-03-11 02:19:48 -0800
commitc686a46d1d9a2e0e3abd0b1eecb647f6afe53a3b (patch)
treec9970f16f440ecf82997cf1822e5f8af621dfe69
parent56ccc0e5e9a0c1032e789d61dfb89a20ff3cbe7f (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 6f7ecf9..f915717 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")\'",