diff options
Diffstat (limited to 'xlators')
-rw-r--r-- | xlators/Makefile.am | 2 | ||||
-rw-r--r-- | xlators/experimental/Makefile.am | 2 | ||||
-rw-r--r-- | xlators/experimental/encryption/Makefile.am (renamed from xlators/encryption/Makefile.am) | 0 | ||||
-rw-r--r-- | xlators/experimental/encryption/crypt/Makefile.am (renamed from xlators/encryption/crypt/Makefile.am) | 0 | ||||
-rw-r--r-- | xlators/experimental/encryption/crypt/src/Makefile.am (renamed from xlators/encryption/crypt/src/Makefile.am) | 2 | ||||
-rw-r--r-- | xlators/experimental/encryption/crypt/src/atom.c (renamed from xlators/encryption/crypt/src/atom.c) | 0 | ||||
-rw-r--r-- | xlators/experimental/encryption/crypt/src/crypt-common.h (renamed from xlators/encryption/crypt/src/crypt-common.h) | 0 | ||||
-rw-r--r-- | xlators/experimental/encryption/crypt/src/crypt-mem-types.h (renamed from xlators/encryption/crypt/src/crypt-mem-types.h) | 0 | ||||
-rw-r--r-- | xlators/experimental/encryption/crypt/src/crypt.c (renamed from xlators/encryption/crypt/src/crypt.c) | 0 | ||||
-rw-r--r-- | xlators/experimental/encryption/crypt/src/crypt.h (renamed from xlators/encryption/crypt/src/crypt.h) | 0 | ||||
-rw-r--r-- | xlators/experimental/encryption/crypt/src/data.c (renamed from xlators/encryption/crypt/src/data.c) | 0 | ||||
-rw-r--r-- | xlators/experimental/encryption/crypt/src/keys.c (renamed from xlators/encryption/crypt/src/keys.c) | 0 | ||||
-rw-r--r-- | xlators/experimental/encryption/crypt/src/metadata.c (renamed from xlators/encryption/crypt/src/metadata.c) | 0 | ||||
-rw-r--r-- | xlators/experimental/encryption/crypt/src/metadata.h (renamed from xlators/encryption/crypt/src/metadata.h) | 0 | ||||
-rw-r--r-- | xlators/experimental/encryption/rot-13/Makefile.am (renamed from xlators/encryption/rot-13/Makefile.am) | 0 | ||||
-rw-r--r-- | xlators/experimental/encryption/rot-13/src/Makefile.am (renamed from xlators/encryption/rot-13/src/Makefile.am) | 2 | ||||
-rw-r--r-- | xlators/experimental/encryption/rot-13/src/rot-13.c (renamed from xlators/encryption/rot-13/src/rot-13.c) | 0 | ||||
-rw-r--r-- | xlators/experimental/encryption/rot-13/src/rot-13.h (renamed from xlators/encryption/rot-13/src/rot-13.h) | 0 | ||||
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 3 | ||||
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-set.c | 8 |
20 files changed, 10 insertions, 9 deletions
diff --git a/xlators/Makefile.am b/xlators/Makefile.am index ea1be844ef4..e837e57663a 100644 --- a/xlators/Makefile.am +++ b/xlators/Makefile.am @@ -2,7 +2,7 @@ if ENABLE_EXPERIMENTAL EXPERIMENTAL = experimental endif -SUBDIRS = cluster storage protocol performance debug features encryption mount nfs mgmt system \ +SUBDIRS = cluster storage protocol performance debug features mount nfs mgmt system \ playground meta $(EXPERIMENTAL) EXTRA_DIST = xlator.sym diff --git a/xlators/experimental/Makefile.am b/xlators/experimental/Makefile.am index a530845c4c0..7d6024d7d1a 100644 --- a/xlators/experimental/Makefile.am +++ b/xlators/experimental/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = jbr-client jbr-server fdl dht2 posix2 +SUBDIRS = jbr-client jbr-server fdl dht2 posix2 encryption CLEANFILES = diff --git a/xlators/encryption/Makefile.am b/xlators/experimental/encryption/Makefile.am index 36efc6698bd..36efc6698bd 100644 --- a/xlators/encryption/Makefile.am +++ b/xlators/experimental/encryption/Makefile.am diff --git a/xlators/encryption/crypt/Makefile.am b/xlators/experimental/encryption/crypt/Makefile.am index d471a3f9243..d471a3f9243 100644 --- a/xlators/encryption/crypt/Makefile.am +++ b/xlators/experimental/encryption/crypt/Makefile.am diff --git a/xlators/encryption/crypt/src/Makefile.am b/xlators/experimental/encryption/crypt/src/Makefile.am index 05fd3d5096b..ba37a64d3de 100644 --- a/xlators/encryption/crypt/src/Makefile.am +++ b/xlators/experimental/encryption/crypt/src/Makefile.am @@ -1,7 +1,7 @@ if ENABLE_CRYPT_XLATOR xlator_LTLIBRARIES = crypt.la -xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption +xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/experimental/encryption crypt_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) diff --git a/xlators/encryption/crypt/src/atom.c b/xlators/experimental/encryption/crypt/src/atom.c index 21d63e5d6d6..21d63e5d6d6 100644 --- a/xlators/encryption/crypt/src/atom.c +++ b/xlators/experimental/encryption/crypt/src/atom.c diff --git a/xlators/encryption/crypt/src/crypt-common.h b/xlators/experimental/encryption/crypt/src/crypt-common.h index 7c212ad5d25..7c212ad5d25 100644 --- a/xlators/encryption/crypt/src/crypt-common.h +++ b/xlators/experimental/encryption/crypt/src/crypt-common.h diff --git a/xlators/encryption/crypt/src/crypt-mem-types.h b/xlators/experimental/encryption/crypt/src/crypt-mem-types.h index 1954c579423..1954c579423 100644 --- a/xlators/encryption/crypt/src/crypt-mem-types.h +++ b/xlators/experimental/encryption/crypt/src/crypt-mem-types.h diff --git a/xlators/encryption/crypt/src/crypt.c b/xlators/experimental/encryption/crypt/src/crypt.c index 2982bb26db0..2982bb26db0 100644 --- a/xlators/encryption/crypt/src/crypt.c +++ b/xlators/experimental/encryption/crypt/src/crypt.c diff --git a/xlators/encryption/crypt/src/crypt.h b/xlators/experimental/encryption/crypt/src/crypt.h index c1bfe3fcd0c..c1bfe3fcd0c 100644 --- a/xlators/encryption/crypt/src/crypt.h +++ b/xlators/experimental/encryption/crypt/src/crypt.h diff --git a/xlators/encryption/crypt/src/data.c b/xlators/experimental/encryption/crypt/src/data.c index 2f96ed2bab5..2f96ed2bab5 100644 --- a/xlators/encryption/crypt/src/data.c +++ b/xlators/experimental/encryption/crypt/src/data.c diff --git a/xlators/encryption/crypt/src/keys.c b/xlators/experimental/encryption/crypt/src/keys.c index e9da55960c8..e9da55960c8 100644 --- a/xlators/encryption/crypt/src/keys.c +++ b/xlators/experimental/encryption/crypt/src/keys.c diff --git a/xlators/encryption/crypt/src/metadata.c b/xlators/experimental/encryption/crypt/src/metadata.c index 1364f825a98..1364f825a98 100644 --- a/xlators/encryption/crypt/src/metadata.c +++ b/xlators/experimental/encryption/crypt/src/metadata.c diff --git a/xlators/encryption/crypt/src/metadata.h b/xlators/experimental/encryption/crypt/src/metadata.h index b67ae25b58c..b67ae25b58c 100644 --- a/xlators/encryption/crypt/src/metadata.h +++ b/xlators/experimental/encryption/crypt/src/metadata.h diff --git a/xlators/encryption/rot-13/Makefile.am b/xlators/experimental/encryption/rot-13/Makefile.am index d471a3f9243..d471a3f9243 100644 --- a/xlators/encryption/rot-13/Makefile.am +++ b/xlators/experimental/encryption/rot-13/Makefile.am diff --git a/xlators/encryption/rot-13/src/Makefile.am b/xlators/experimental/encryption/rot-13/src/Makefile.am index 9978661509d..1b4bb921279 100644 --- a/xlators/encryption/rot-13/src/Makefile.am +++ b/xlators/experimental/encryption/rot-13/src/Makefile.am @@ -1,5 +1,5 @@ xlator_LTLIBRARIES = rot-13.la -xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption +xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/experimental/encryption rot_13_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) diff --git a/xlators/encryption/rot-13/src/rot-13.c b/xlators/experimental/encryption/rot-13/src/rot-13.c index 6ec1b47c87b..6ec1b47c87b 100644 --- a/xlators/encryption/rot-13/src/rot-13.c +++ b/xlators/experimental/encryption/rot-13/src/rot-13.c diff --git a/xlators/encryption/rot-13/src/rot-13.h b/xlators/experimental/encryption/rot-13/src/rot-13.h index a2017513437..a2017513437 100644 --- a/xlators/encryption/rot-13/src/rot-13.h +++ b/xlators/experimental/encryption/rot-13/src/rot-13.h diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index a270f136c92..9809cb68e40 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -4045,7 +4045,8 @@ client_graph_builder (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, if (ret == -1) goto out; if (ret) { - xl = volgen_graph_add (graph, "encryption/crypt", volname); + xl = volgen_graph_add (graph, "experimental/encryption/crypt", + volname); if (!xl) { ret = -1; goto out; diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index 68c57fc10cb..5e9616bdfcd 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -1602,7 +1602,7 @@ struct volopt_map_entry glusterd_volopt_map[] = { /* Crypt xlator options */ { .key = "features.encryption", - .voltype = "encryption/crypt", + .voltype = "experimental/encryption/crypt", .option = "!feat", .value = "off", .op_version = 3, @@ -1612,17 +1612,17 @@ struct volopt_map_entry glusterd_volopt_map[] = { }, { .key = "encryption.master-key", - .voltype = "encryption/crypt", + .voltype = "experimental/encryption/crypt", .op_version = 3, .flags = OPT_FLAG_CLIENT_OPT }, { .key = "encryption.data-key-size", - .voltype = "encryption/crypt", + .voltype = "experimental/encryption/crypt", .op_version = 3, .flags = OPT_FLAG_CLIENT_OPT }, { .key = "encryption.block-size", - .voltype = "encryption/crypt", + .voltype = "experimental/encryption/crypt", .op_version = 3, .flags = OPT_FLAG_CLIENT_OPT }, |