diff options
author | Pranith K <pranithk@gluster.com> | 2011-07-14 06:31:08 +0000 |
---|---|---|
committer | Anand Avati <avati@gluster.com> | 2011-07-17 07:45:29 -0700 |
commit | 5dff9a2938c199285662bb5b33d7e3aeda0e3fb6 (patch) | |
tree | 20af21a206a8ed7937101005cbb4b9128b5c48fd /xlators/cluster/afr/src/afr-dir-write.c | |
parent | 84c3d7a83a8c84ca11514202a1bc365026fd1c87 (diff) |
cluster/afr: Fix conflict files and gfid self-heal
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>
BUG: 2745 (failure to detect split brain)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2745
Diffstat (limited to 'xlators/cluster/afr/src/afr-dir-write.c')
-rw-r--r-- | xlators/cluster/afr/src/afr-dir-write.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xlators/cluster/afr/src/afr-dir-write.c b/xlators/cluster/afr/src/afr-dir-write.c index 6da666804de..58e979791e7 100644 --- a/xlators/cluster/afr/src/afr-dir-write.c +++ b/xlators/cluster/afr/src/afr-dir-write.c @@ -54,6 +54,8 @@ afr_build_parent_loc (loc_t *parent, loc_t *child) char *tmp = NULL; if (!child->parent) { + //this should never be called with root as the child + GF_ASSERT (0); loc_copy (parent, child); return; } |