From f62ff8a8df7ab7c0c551b650f9bd2f1a87b8dc71 Mon Sep 17 00:00:00 2001 From: Pavan Sondur Date: Tue, 5 Oct 2010 04:48:27 +0000 Subject: features/locks: cluster/afr: Misc fixes for lock recovery. Signed-off-by: Pavan Vilas Sondur Signed-off-by: Vijay Bellur BUG: 865 (Add locks recovery support in GlusterFS) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=865 --- xlators/protocol/client/src/client-lk.c | 2 ++ xlators/protocol/server/src/server3_1-fops.c | 5 +++++ 2 files changed, 7 insertions(+) (limited to 'xlators/protocol') diff --git a/xlators/protocol/client/src/client-lk.c b/xlators/protocol/client/src/client-lk.c index 089b0d8e4..76ebc02d6 100644 --- a/xlators/protocol/client/src/client-lk.c +++ b/xlators/protocol/client/src/client-lk.c @@ -471,6 +471,8 @@ client_cmd_to_gf_cmd (int32_t cmd, int32_t *gf_cmd) *gf_cmd = GF_LK_RESLK_LCKW; else if (cmd == F_RESLK_UNLCK) *gf_cmd = GF_LK_RESLK_UNLCK; + else if (cmd == F_GETLK_FD) + *gf_cmd = GF_LK_GETLK_FD; else ret = -1; diff --git a/xlators/protocol/server/src/server3_1-fops.c b/xlators/protocol/server/src/server3_1-fops.c index 69d8cfbfa..6ce7bba55 100644 --- a/xlators/protocol/server/src/server3_1-fops.c +++ b/xlators/protocol/server/src/server3_1-fops.c @@ -4900,8 +4900,13 @@ server_lk (rpcsvc_request_t *req) case GF_LK_RESLK_UNLCK: state->cmd = F_RESLK_UNLCK; break; + case GF_LK_GETLK_FD: + state->cmd = F_GETLK_FD; + break; + } + gf_proto_flock_to_flock (&args.flock, &state->flock); switch (state->type) { -- cgit