From 3d6e03926c093433b27400f2b7682fc7ed9c5a7e Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Wed, 14 Jul 2010 07:13:50 +0000 Subject: v2 [PATCH BRANCH:release-3.0 BUG:1050] protocol/server: Convert OS specific lock value to Gluster lock value server/protocol's getlk implementation needs to convert the flock on the system to glfs own flock before returning it to the client to prevent misinterpretation of the flock structure. Signed-off-by: Pranith Kumar K Signed-off-by: Anand V. Avati BUG: 1050 (fcntl F_GETLK lock calls do not return correct flock on non-linux systems) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1050 --- xlators/protocol/server/src/server-protocol.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/xlators/protocol/server/src/server-protocol.c b/xlators/protocol/server/src/server-protocol.c index 6af276ec8..c4b0d47c8 100644 --- a/xlators/protocol/server/src/server-protocol.c +++ b/xlators/protocol/server/src/server-protocol.c @@ -410,6 +410,22 @@ server_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, hdr->rsp.op_errno = hton32 (gf_errno); if (op_ret == 0) { + switch (lock->l_type) { + case F_RDLCK: + lock->l_type = GF_LK_F_RDLCK; + break; + case F_WRLCK: + lock->l_type = GF_LK_F_WRLCK; + break; + case F_UNLCK: + lock->l_type = GF_LK_F_UNLCK; + break; + default: + gf_log (this->name, GF_LOG_ERROR, + "Unknown lock type: %"PRId32"!", lock->l_type); + break; + } + gf_flock_from_flock (&rsp->flock, lock); } else if (op_errno != ENOSYS) { state = CALL_STATE(frame); -- cgit