diff options
Diffstat (limited to 'xlators/cluster/dht')
| -rw-r--r-- | xlators/cluster/dht/src/Makefile.am | 18 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-rebalance.c | 12 |
2 files changed, 3 insertions, 27 deletions
diff --git a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am index 7cb2961f30a..caeb17b0f07 100644 --- a/xlators/cluster/dht/src/Makefile.am +++ b/xlators/cluster/dht/src/Makefile.am @@ -1,7 +1,4 @@ xlator_LTLIBRARIES = dht.la nufa.la switch.la -if BUILD_GFDB - xlator_LTLIBRARIES += tier.la -endif AM_CFLAGS = -Wall $(GF_CFLAGS) @@ -16,7 +13,6 @@ dht_la_SOURCES = $(dht_common_source) dht.c nufa_la_SOURCES = $(dht_common_source) nufa.c switch_la_SOURCES = $(dht_common_source) switch.c -tier_la_SOURCES = $(dht_common_source) tier.c tier-common.c dht_la_LDFLAGS = -module \ -export-symbols $(top_srcdir)/xlators/cluster/dht/src/dht.sym \ @@ -33,27 +29,19 @@ switch_la_LDFLAGS = -module \ $(GF_XLATOR_LDFLAGS) switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -tier_la_LDFLAGS = -module \ - -export-symbols $(top_srcdir)/xlators/cluster/dht/src/tier.sym \ - $(LIB_DL) $(GF_XLATOR_LDFLAGS) -tier_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - noinst_HEADERS = dht-common.h dht-mem-types.h dht-messages.h \ - dht-lock.h tier-common.h tier.h \ - $(top_builddir)/xlators/lib/src/libxlator.h + dht-lock.h $(top_builddir)/xlators/lib/src/libxlator.h AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ - -I$(top_srcdir)/libglusterfs/src/gfdb \ -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \ -I$(top_srcdir)/rpc/rpc-lib/src \ -I$(top_srcdir)/xlators/lib/src \ -DDATADIR=\"$(localstatedir)\" \ - -DLIBDIR=\"$(libdir)\" \ - -DLIBGFDB_VERSION=\"$(LIBGFDB_VERSION)\" + -DLIBDIR=\"$(libdir)\" CLEANFILES = -EXTRA_DIST = dht.sym nufa.sym switch.sym tier.sym +EXTRA_DIST = dht.sym nufa.sym switch.sym uninstall-local: rm -f $(DESTDIR)$(xlatordir)/distribute.so diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index 0b85ac9ae15..41a587823a9 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -8,7 +8,6 @@ cases as published by the Free Software Foundation. */ -#include "tier.h" #include "dht-common.h" #include "xlator.h" #include "syscall.h" @@ -2135,17 +2134,6 @@ dht_migrate_file(xlator_t *this, loc_t *loc, xlator_t *from, xlator_t *to, } } - /* store size of previous migrated file */ - if (defrag && defrag->tier_conf.is_tier) { - if (from != TIER_HASHED_SUBVOL) { - defrag->tier_conf.st_last_promoted_size = stbuf.ia_size; - } else { - /* Don't delete the linkto file on the hashed subvol */ - delete_src_linkto = _gf_false; - defrag->tier_conf.st_last_demoted_size = stbuf.ia_size; - } - } - /* The src file is being unlinked after this so we don't need to clean it up */ clean_src = _gf_false; |