diff options
| author | Pavan Sondur <pavan@gluster.com> | 2010-10-01 01:42:46 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-10-01 01:02:52 -0700 |
| commit | 9555e5ee7dd2c3a2c98cf505bb198e453ea747d1 (patch) | |
| tree | 1daa301a747d2b4cb490e5742b364522e8cc2fcc /xlators/features/locks/src | |
| parent | d355ecd89427871d8d3f20a99acd284baccef6e1 (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/features/locks/src')
| -rw-r--r-- | xlators/features/locks/src/posix.c | 2 | ||||
| -rw-r--r-- | xlators/features/locks/src/reservelk.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c index f08559424..7c8ead8b3 100644 --- a/xlators/features/locks/src/posix.c +++ b/xlators/features/locks/src/posix.c @@ -825,7 +825,7 @@ out: static void pl_mark_eol_lock (posix_lock_t *lock) { - lock->user_flock.l_type = GF_LK_RECLK; + lock->user_flock.l_type = GF_LK_EOL; return; } diff --git a/xlators/features/locks/src/reservelk.c b/xlators/features/locks/src/reservelk.c index c36484c46..9b7189632 100644 --- a/xlators/features/locks/src/reservelk.c +++ b/xlators/features/locks/src/reservelk.c @@ -42,7 +42,7 @@ __delete_reserve_lock (posix_lock_t *lock) void __destroy_reserve_lock (posix_lock_t *lock) { - FREE (lock); + GF_FREE (lock); } /* Return true if the two reservelks have exactly same lock boundaries */ @@ -125,7 +125,7 @@ __reservelk_conflict (xlator_t *this, pl_inode_t *pl_inode, list_del_init (&conf->list); gf_log (this->name, GF_LOG_TRACE, "Removing the matching reservelk for setlk to progress"); - FREE (conf); + GF_FREE (conf); ret = 0; } else { gf_log (this->name, GF_LOG_TRACE, |