summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorN Balachandran <nbalacha@redhat.com>2018-02-06 15:20:16 +0530
committerN Balachandran <nbalacha@redhat.com>2018-02-06 15:22:48 +0530
commit3fb1df7870e03c9dea1f4a46c22774006a20fea1 (patch)
tree93ec62a7a8c2a13ead82d77e0990412addff1f78
parent3f824314f6367206681152c7523bacbfb30fa945 (diff)
cluster/dht: Unlink linkto files as root
Non-privileged users cannot delete linkto files. However the failure to unlink a stale linkto causes DHT to fail the lookup with EIO and hence prevent access to the file. Change-Id: Id295362d41e52263790694602f36f1219f0646a2 BUG: 1542318 Signed-off-by: N Balachandran <nbalacha@redhat.com>
-rw-r--r--xlators/cluster/dht/src/dht-common.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
index d41d07fc6e8..5717650dd12 100644
--- a/xlators/cluster/dht/src/dht-common.c
+++ b/xlators/cluster/dht/src/dht-common.c
@@ -2023,6 +2023,8 @@ dht_lookup_unlink_of_false_linkto_cbk (call_frame_t *frame, void *cookie,
local = (dht_local_t*)frame->local;
path = local->loc.path;
+ FRAME_SU_UNDO (frame, dht_local_t);
+
gf_msg (this->name, GF_LOG_INFO, 0,
DHT_MSG_UNLINK_LOOKUP_INFO, "lookup_unlink returned with "
"op_ret -> %d and op-errno -> %d for %s", op_ret, op_errno,
@@ -2092,6 +2094,7 @@ dht_lookup_unlink_stale_linkto_cbk (call_frame_t *frame, void *cookie,
"op_errno %d for %s", op_ret, op_errno,
((path==NULL)?"null":path));
+ FRAME_SU_UNDO (frame, dht_local_t);
DHT_STACK_UNWIND (lookup, frame, -1, ENOENT, NULL, NULL, NULL,
NULL);
@@ -2248,15 +2251,15 @@ dht_lookup_everywhere_done (call_frame_t *frame, xlator_t *this)
DHT_STACK_UNWIND (lookup, frame, -1, ENOENT,
NULL, NULL, NULL, NULL);
} else {
- local->skip_unlink.handle_valid_link = _gf_false;
+ local->skip_unlink.handle_valid_link = _gf_false;
gf_msg_debug (this->name, 0,
"No Cached was found and "
"unlink on hashed was skipped"
" so performing now: %s",
local->loc.path);
-
- STACK_WIND (frame,
+ FRAME_SU_DO (frame, dht_local_t);
+ STACK_WIND (frame,
dht_lookup_unlink_stale_linkto_cbk,
hashed_subvol,
hashed_subvol->fops->unlink,
@@ -2381,6 +2384,7 @@ dht_lookup_everywhere_done (call_frame_t *frame, xlator_t *this)
NULL, NULL);
} else {
local->call_cnt = 1;
+ FRAME_SU_DO (frame, dht_local_t);
STACK_WIND (frame,
dht_lookup_unlink_of_false_linkto_cbk,
hashed_subvol,