|
 |
50dc83 |
From 6198461bce7d264b71fe91e981aa3af3a19a8abe Mon Sep 17 00:00:00 2001
|
|
|
50dc83 |
From: N Balachandran <nbalacha@redhat.com>
|
|
|
50dc83 |
Date: Tue, 4 Jun 2019 14:51:44 +0530
|
|
|
50dc83 |
Subject: [PATCH 168/169] cluster/dht: Fix directory perms during selfheal
|
|
|
50dc83 |
|
|
|
50dc83 |
Fixed a bug in the revalidate code path that wiped out
|
|
|
50dc83 |
directory permissions if no mds subvol was found.
|
|
|
50dc83 |
|
|
|
50dc83 |
upstream: https://review.gluster.org/#/c/glusterfs/+/22813/
|
|
|
50dc83 |
|
|
|
50dc83 |
> Change-Id: I8b4239ffee7001493c59d4032a2d3062586ea115
|
|
|
50dc83 |
> fixes: bz#1716830
|
|
|
50dc83 |
> Signed-off-by: N Balachandran <nbalacha@redhat.com>
|
|
|
50dc83 |
|
|
|
50dc83 |
BUG: 1716821
|
|
|
50dc83 |
Change-Id: I6d84d381d07a27d1ef9113a2104a62ceaf2110e3
|
|
|
50dc83 |
Signed-off-by: N Balachandran <nbalacha@redhat.com>
|
|
|
50dc83 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/172622
|
|
|
50dc83 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
50dc83 |
Reviewed-by: Mohit Agrawal <moagrawa@redhat.com>
|
|
|
50dc83 |
---
|
|
|
50dc83 |
xlators/cluster/dht/src/dht-common.c | 8 +++++---
|
|
|
50dc83 |
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
50dc83 |
|
|
|
50dc83 |
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
|
|
|
50dc83 |
index 183872f..e1edb38 100644
|
|
|
50dc83 |
--- a/xlators/cluster/dht/src/dht-common.c
|
|
|
50dc83 |
+++ b/xlators/cluster/dht/src/dht-common.c
|
|
|
50dc83 |
@@ -1739,9 +1739,11 @@ unlock:
|
|
|
50dc83 |
|
|
|
50dc83 |
if (dht_needs_selfheal(frame, this)) {
|
|
|
50dc83 |
if (!__is_root_gfid(local->loc.inode->gfid)) {
|
|
|
50dc83 |
- local->stbuf.ia_gid = local->mds_stbuf.ia_gid;
|
|
|
50dc83 |
- local->stbuf.ia_uid = local->mds_stbuf.ia_uid;
|
|
|
50dc83 |
- local->stbuf.ia_prot = local->mds_stbuf.ia_prot;
|
|
|
50dc83 |
+ if (local->mds_subvol) {
|
|
|
50dc83 |
+ local->stbuf.ia_gid = local->mds_stbuf.ia_gid;
|
|
|
50dc83 |
+ local->stbuf.ia_uid = local->mds_stbuf.ia_uid;
|
|
|
50dc83 |
+ local->stbuf.ia_prot = local->mds_stbuf.ia_prot;
|
|
|
50dc83 |
+ }
|
|
|
50dc83 |
} else {
|
|
|
50dc83 |
local->stbuf.ia_gid = local->prebuf.ia_gid;
|
|
|
50dc83 |
local->stbuf.ia_uid = local->prebuf.ia_uid;
|
|
|
50dc83 |
--
|
|
|
50dc83 |
1.8.3.1
|
|
|
50dc83 |
|