summaryrefslogtreecommitdiffstats
path: root/xlators/protocol
diff options
context:
space:
mode:
authorPavan Sondur <pavan@gluster.com>2010-10-01 01:42:46 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-10-01 01:02:52 -0700
commit9555e5ee7dd2c3a2c98cf505bb198e453ea747d1 (patch)
tree1daa301a747d2b4cb490e5742b364522e8cc2fcc /xlators/protocol
parentd355ecd89427871d8d3f20a99acd284baccef6e1 (diff)
cluster/afr: Recover locks on child_up from source to sink.
Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 865 (Add locks recovery support in GlusterFS) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=865
Diffstat (limited to 'xlators/protocol')
-rw-r--r--xlators/protocol/client/src/client-lk.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/xlators/protocol/client/src/client-lk.c b/xlators/protocol/client/src/client-lk.c
index 4ad7fc2b1..37cae88b7 100644
--- a/xlators/protocol/client/src/client-lk.c
+++ b/xlators/protocol/client/src/client-lk.c
@@ -164,7 +164,7 @@ __delete_client_lock (client_posix_lock_t *lock)
static void
__destroy_client_lock (client_posix_lock_t *lock)
{
- free (lock);
+ GF_FREE (lock);
}
/* Subtract two locks */
@@ -861,7 +861,7 @@ int
client_attempt_lock_recovery (xlator_t *this, clnt_fd_ctx_t *fdctx)
{
call_frame_t *frame = NULL;
- clnt_local_t *local = NULL;
+ clnt_local_t *local = NULL;
client_posix_lock_t *lock = NULL;
struct flock reserve_flock;
@@ -895,6 +895,7 @@ client_attempt_lock_recovery (xlator_t *this, clnt_fd_ctx_t *fdctx)
construct_reserve_lock (lock, frame, &reserve_flock);
+ frame->local = local;
local->fdctx = fdctx;
local->client_lock = lock;