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>

1 files changed, 37 insertions, 0 deletions

diff --git a/xlators/cluster/afr-v1/src/Makefile.am b/xlators/cluster/afr-v1/src/Makefile.am
new file mode 100644
index 000000000..35d18a6c0
--- /dev/null
+++ b/xlators/cluster/afr-v1/src/Makefile.am
@@ -0,0 +1,37 @@
+xlator_LTLIBRARIES = afr.la pump.la
+xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
+
+afr_common_source = afr-dir-read.c afr-dir-write.c afr-inode-read.c \
+	afr-inode-write.c afr-open.c afr-transaction.c afr-self-heal-data.c \
+	afr-self-heal-common.c afr-self-heal-metadata.c afr-self-heal-entry.c \
+	afr-self-heal-algorithm.c afr-lk-common.c afr-self-heald.c \
+	$(top_builddir)/xlators/lib/src/libxlator.c
+
+afr_la_LDFLAGS = -module -avoid-version
+afr_la_SOURCES = $(afr_common_source) afr.c
+afr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+pump_la_LDFLAGS = -module -avoid-version
+pump_la_SOURCES =  $(afr_common_source) pump.c
+pump_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+noinst_HEADERS = afr.h afr-transaction.h afr-inode-write.h afr-inode-read.h \
+	afr-dir-read.h afr-dir-write.h afr-self-heal.h afr-self-heal-common.h \
+	afr-self-heal-algorithm.h pump.h afr-mem-types.h afr-common.c \
+	afr-self-heald.h $(top_builddir)/xlators/lib/src/libxlator.h \
+	$(top_builddir)/glusterfsd/src/glusterfsd.h
+
+AM_CPPFLAGS = $(GF_CPPFLAGS) \
+	-I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/xlators/lib/src \
+	-I$(top_srcdir)/rpc/rpc-lib/src
+
+AM_CFLAGS = -Wall $(GF_CFLAGS)
+
+CLEANFILES =
+
+uninstall-local:
+	rm -f $(DESTDIR)$(xlatordir)/replicate.so
+	rm -f $(DESTDIR)$(xlatordir)/pump.so
+
+install-data-hook:
+	ln -sf afr.so $(DESTDIR)$(xlatordir)/replicate.so