diff options
| author | Ravishankar N <ravishankar@redhat.com> | 2014-04-03 11:47:28 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2014-04-03 21:32:52 -0700 |
| commit | 52aac0ae61913c6c6997f27710b6bfcf8ca73bce (patch) | |
| tree | 2d80239535469984f9c731915b2cdcdbec0d2125 /libglusterfs/src | |
| parent | 8596ecba074081d7843a6bea2299951db48aa3b5 (diff) | |
cluster/afr: Add the non-refactored afr code into the treedevelopment
Reverted all afr commits " 6d37392 - cluster/afr: refactor <Anand Avati>" and
upwards. The resulting afr code was moved to afr-v1 folder, resulting in
the following changes:
modified: libglusterfs/src/gf-dirent.c
modified: libglusterfs/src/glusterfs.h
modified: libglusterfs/src/xlator.c
modified: tests/basic/pump.t
modified: tests/bugs/859927/repl.t
modified: tests/bugs/bug-1015990-rep.t
modified: tests/bugs/bug-1035576.t
modified: tests/bugs/bug-1037501.t
modified: tests/bugs/bug-1058797.t
modified: tests/bugs/bug-767585-gfid.t
modified: tests/bugs/bug-802417.t
modified: tests/bugs/bug-830665.t
modified: tests/bugs/bug-853690.t
modified: tests/bugs/bug-865825.t
modified: tests/bugs/bug-873962.t
modified: tests/bugs/bug-888174.t
modified: tests/bugs/bug-906646.t
modified: tests/bugs/bug-913051.t
modified: tests/bugs/bug-913544.t
modified: tests/bugs/bug-918437-sh-mtime.t
modified: tests/bugs/bug-977797.t
modified: tests/volume.rc
new file: xlators/cluster/afr-v1/Makefile.am
new file: xlators/cluster/afr-v1/src/Makefile.am
new file: xlators/cluster/afr-v1/src/afr-common.c
new file: xlators/cluster/afr-v1/src/afr-dir-read.c
new file: xlators/cluster/afr-v1/src/afr-dir-read.h
new file: xlators/cluster/afr-v1/src/afr-dir-write.c
new file: xlators/cluster/afr-v1/src/afr-dir-write.h
new file: xlators/cluster/afr-v1/src/afr-inode-read.c
new file: xlators/cluster/afr-v1/src/afr-inode-read.h
new file: xlators/cluster/afr-v1/src/afr-inode-write.c
new file: xlators/cluster/afr-v1/src/afr-inode-write.h
new file: xlators/cluster/afr-v1/src/afr-lk-common.c
new file: xlators/cluster/afr-v1/src/afr-mem-types.h
new file: xlators/cluster/afr-v1/src/afr-open.c
new file: xlators/cluster/afr-v1/src/afr-self-heal-algorithm.c
new file: xlators/cluster/afr-v1/src/afr-self-heal-algorithm.h
new file: xlators/cluster/afr-v1/src/afr-self-heal-common.c
new file: xlators/cluster/afr-v1/src/afr-self-heal-common.h
new file: xlators/cluster/afr-v1/src/afr-self-heal-data.c
new file: xlators/cluster/afr-v1/src/afr-self-heal-entry.c
new file: xlators/cluster/afr-v1/src/afr-self-heal-metadata.c
new file: xlators/cluster/afr-v1/src/afr-self-heal.h
new file: xlators/cluster/afr-v1/src/afr-self-heald.c
new file: xlators/cluster/afr-v1/src/afr-self-heald.h
new file: xlators/cluster/afr-v1/src/afr-transaction.c
new file: xlators/cluster/afr-v1/src/afr-transaction.h
new file: xlators/cluster/afr-v1/src/afr.c
new file: xlators/cluster/afr-v1/src/afr.h
new file: xlators/cluster/afr-v1/src/pump.c
new file: xlators/cluster/afr-v1/src/pump.h
modified: xlators/cluster/dht/src/dht-common.c
modified: xlators/cluster/stripe/src/stripe.c
modified: xlators/features/index/src/index.c
modified: xlators/features/index/src/index.h
Also making changes to compile cluster/afr-v1 instead of cluster/afr :
modified: configure.ac
modified: xlators/cluster/Makefile.am
Change-Id: I3e33ac361e381f5475d1a58ea938d2676f6d5a2f
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-on: http://review.gluster.org/7388
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Diffstat (limited to 'libglusterfs/src')
| -rw-r--r-- | libglusterfs/src/gf-dirent.c | 2 | ||||
| -rw-r--r-- | libglusterfs/src/glusterfs.h | 2 | ||||
| -rw-r--r-- | libglusterfs/src/xlator.c | 8 |
3 files changed, 3 insertions, 9 deletions
diff --git a/libglusterfs/src/gf-dirent.c b/libglusterfs/src/gf-dirent.c index 0cda83a27..bb028c967 100644 --- a/libglusterfs/src/gf-dirent.c +++ b/libglusterfs/src/gf-dirent.c @@ -83,8 +83,6 @@ gf_link_inodes_from_dirent (xlator_t *this, inode_t *parent, if (entry->inode) { link_inode = inode_link (entry->inode, parent, entry->d_name, &entry->d_stat); - if (!link_inode) - continue; inode_lookup (link_inode); inode_unref (link_inode); } diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h index 5dd26b451..ebda76d93 100644 --- a/libglusterfs/src/glusterfs.h +++ b/libglusterfs/src/glusterfs.h @@ -132,7 +132,7 @@ /* Index xlator related */ #define GF_XATTROP_INDEX_GFID "glusterfs.xattrop_index_gfid" -#define GF_XATTROP_INDEX_COUNT "glusterfs.xattrop_index_count" +#define GF_BASE_INDICES_HOLDER_GFID "glusterfs.base_indicies_holder_gfid" #define GF_GFIDLESS_LOOKUP "gfidless-lookup" /* replace-brick and pump related internal xattrs */ diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c index 1bded6d3d..f3df8e2ae 100644 --- a/libglusterfs/src/xlator.c +++ b/libglusterfs/src/xlator.c @@ -680,9 +680,7 @@ loc_copy_overload_parent (loc_t *dst, loc_t *src, inode_t *parent) dst->name = strrchr (dst->path, '/'); if (dst->name) dst->name++; - } else if (src->name) { - dst->name = src->name; - } + } ret = 0; out: @@ -720,9 +718,7 @@ loc_copy (loc_t *dst, loc_t *src) dst->name = strrchr (dst->path, '/'); if (dst->name) dst->name++; - } else if (src->name) { - dst->name = src->name; - } + } ret = 0; out: |