diff options
| -rw-r--r-- | libglusterfs/src/stack.h | 16 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-common.c | 3 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr.h | 2 |
3 files changed, 20 insertions, 1 deletions
diff --git a/libglusterfs/src/stack.h b/libglusterfs/src/stack.h index f06267c3848..1c3e3430e12 100644 --- a/libglusterfs/src/stack.h +++ b/libglusterfs/src/stack.h @@ -182,6 +182,22 @@ STACK_DESTROY (call_stack_t *stack) #define cbk(x) cbk_##x +#define FRAME_SU_DO(frm, local_type) \ + do { \ + local_type *__local = (frm)->local; \ + __local->uid = frm->root->uid; \ + __local->gid = frm->root->gid; \ + frm->root->uid = 0; \ + frm->root->gid = 0; \ + } while (0); \ + +#define FRAME_SU_UNDO(frm, local_type) \ + do { \ + local_type *__local = (frm)->local; \ + frm->root->uid = __local->uid; \ + frm->root->gid = __local->gid; \ + } while (0); \ + /* make a call */ #define STACK_WIND(frame, rfn, obj, fn, params ...) \ diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index 8b0d565f877..710087a554a 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -1500,7 +1500,6 @@ afr_local_t *afr_local_copy (afr_local_t *l, xlator_t *this) return lc; } - int afr_self_heal_completion_cbk (call_frame_t *bgsh_frame, xlator_t *this) { @@ -1524,6 +1523,7 @@ afr_self_heal_completion_cbk (call_frame_t *bgsh_frame, xlator_t *this) gf_log (this->name, GF_LOG_NORMAL, "background %s self-heal completed on %s", sh_type_str, local->loc.path); + FRAME_SU_UNDO (bgsh_frame, afr_local_t); if (!sh->unwound) { sh->unwind (sh->orig_frame, this); @@ -1622,6 +1622,7 @@ afr_self_heal (call_frame_t *frame, xlator_t *this) gf_afr_mt_int32_t); } + FRAME_SU_DO (sh_frame, afr_local_t); if (local->success_count && local->enoent_count) { afr_self_heal_missing_entries (sh_frame, this); } else { diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h index b0e434142a3..3efa484b74a 100644 --- a/xlators/cluster/afr/src/afr.h +++ b/xlators/cluster/afr/src/afr.h @@ -276,6 +276,8 @@ typedef struct _afr_locked_fd { } afr_locked_fd_t; typedef struct _afr_local { + int uid; + int gid; unsigned int call_count; unsigned int success_count; unsigned int enoent_count; |