path: root/xlators/cluster/dht/src/dht-common.h
diff options
authorSakshi <>2015-07-16 14:31:03 +0530
committerRaghavendra G <>2016-04-05 22:06:02 -0700
commitc25f88c953215b1bfc135aeafc43dc00a663206d (patch)
tree63bb8af7f4a2d1b363e5018811fe8d19d423df2c /xlators/cluster/dht/src/dht-common.h
parent648357ffad482a1bda8915d42df9d5b055dae44f (diff)
dht: lock on subvols to prevent lookup vs rmdir race
There is a possibility that while an rmdir is completed on some non-hashed subvol and proceeding to others, a lookup selfheal can recreate the same directory on those subvols for which the rmdir had succeeded. Now the deletion of the parent directory will fail with an ENOTEMPTY. To fix this take blocking inodelk on the subvols before starting rmdir. Selfheal must also take blocking inodelk before creating the entry. Change-Id: I168a195c35ac1230ba7124d3b0ca157755b3df96 BUG: 1245065 Signed-off-by: Sakshi <> Reviewed-on: CentOS-regression: Gluster Build System <> NetBSD-regression: NetBSD Build System <> Smoke: Gluster Build System <> Reviewed-by: Raghavendra G <> Tested-by: Raghavendra G <>
Diffstat (limited to 'xlators/cluster/dht/src/dht-common.h')
1 files changed, 9 insertions, 2 deletions
diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h
index cd192f5baff..b63ee65acfb 100644
--- a/xlators/cluster/dht/src/dht-common.h
+++ b/xlators/cluster/dht/src/dht-common.h
@@ -45,7 +45,7 @@ typedef int (*dht_defrag_cbk_fn_t) (xlator_t *this, xlator_t *dst_node,
call_frame_t *frame, int ret);
typedef int (*dht_refresh_layout_unlock) (call_frame_t *frame, xlator_t *this,
- int op_ret);
+ int op_ret, int invoke_cbk);
typedef int (*dht_refresh_layout_done_handle) (call_frame_t *frame);
@@ -140,6 +140,11 @@ typedef enum {
} qdstatfs_action_t;
+typedef enum {
+} dht_reaction_type_t;
struct dht_skip_linkto_unlink {
gf_boolean_t handle_valid_link;
@@ -270,6 +275,7 @@ struct dht_local {
fop_inodelk_cbk_t inodelk_cbk;
dht_lock_t **locks;
int lk_count;
+ dht_reaction_type_t reaction;
/* whether locking failed on _any_ of the "locks" above */
int op_ret;
@@ -1128,7 +1134,8 @@ dht_nonblocking_inodelk (call_frame_t *frame, dht_lock_t **lk_array,
dht_blocking_inodelk (call_frame_t *frame, dht_lock_t **lk_array,
- int lk_count, fop_inodelk_cbk_t inodelk_cbk);
+ int lk_count, dht_reaction_type_t reaction,
+ fop_inodelk_cbk_t inodelk_cbk);
dht_unlock_inodelk (call_frame_t *frame, dht_lock_t **lk_array, int lk_count,