diff options
| author | ggarg <ggarg@redhat.com> | 2014-05-27 17:08:53 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2014-11-06 22:42:34 -0800 |
| commit | 1fe785152cc44e78fcd67da5091bc780eb42f1dd (patch) | |
| tree | ec23e73b81c3816d7a7d8456824c4b2a83cf887b /xlators/features/barrier/src/barrier.h | |
| parent | 97ccd45fb66a63c0b2436a0245dfb9490e2941b7 (diff) | |
barrier: Correct gfid in statedump of barriered fops
In brick statedump file the barriered fop's gfid was showing 0 when
statedump was taken. This is because of statedump code was not
referring to correct gfid.
With this change statedump code will use correct gfid and gfid will
not be 0 in statedump file when barrier is enable and user takes
statedump of volume.
Change-Id: Ia296cba7e132402df53c602daa160c1c2cd21245
BUG: 1099369
Reviewed-on: http://review.gluster.org/7893
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaushal M <kaushal@redhat.com>
Diffstat (limited to 'xlators/features/barrier/src/barrier.h')
| -rw-r--r-- | xlators/features/barrier/src/barrier.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/xlators/features/barrier/src/barrier.h b/xlators/features/barrier/src/barrier.h index 8face9f6512..0d646f90474 100644 --- a/xlators/features/barrier/src/barrier.h +++ b/xlators/features/barrier/src/barrier.h @@ -16,15 +16,6 @@ #include "timer.h" #include "call-stub.h" -#define BARRIER_SAFE_ASSIGN(lock, to, value) \ - do { \ - LOCK (&(lock)); \ - { \ - to = value; \ - } \ - UNLOCK (&(lock)); \ - } while (0) - #define BARRIER_FOP_CBK(fop_name, label, frame, this, params ...) \ do { \ barrier_priv_t *_priv = NULL; \ @@ -44,7 +35,7 @@ \ _stub = fop_##fop_name##_cbk_stub \ (frame, \ - default_##fop_name##_cbk_resume,\ + barrier_##fop_name##_cbk_resume,\ params); \ if (!_stub) { \ __barrier_disable (this, &queue);\ @@ -67,7 +58,7 @@ unlock: \ #fop_name, strerror (ENOMEM)); \ barrier_dequeue_all (this, &queue); \ } \ - \ + barrier_local_free_gfid (frame); \ STACK_UNWIND_STRICT (fop_name, frame, params); \ goto label; \ } while (0) |