summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorJiffin Tony Thottan <jthottan@redhat.com>2017-08-31 15:07:10 +0530
committerAmar Tumballi <amarts@redhat.com>2017-12-10 01:10:25 +0000
commit6021331f4095813614d184f67fc6a0c08b8e8837 (patch)
treebe614230841d4867349fa267e1262fe3aa8e3d35 /xlators
parentaeff5def7e11de418d55f996926cbd5818c0494d (diff)
trash/selinux : update volume option table in xlator
Add new options defined by https://review.gluster.org/18059 to trash and selinux Updates #302 Change-Id: I31064f26d2b244a2923baa4bb948a6e8ab7b0d1a Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/features/selinux/src/selinux.c3
-rw-r--r--xlators/features/trash/src/trash.c19
2 files changed, 22 insertions, 0 deletions
diff --git a/xlators/features/selinux/src/selinux.c b/xlators/features/selinux/src/selinux.c
index 1a4b39f253c..190f10b57d8 100644
--- a/xlators/features/selinux/src/selinux.c
+++ b/xlators/features/selinux/src/selinux.c
@@ -319,6 +319,9 @@ struct volume_options options[] = {
.type = GF_OPTION_TYPE_BOOL,
.default_value = "on",
.description = "Enable/disable selinux translator",
+ .op_version = {GD_OP_VERSION_3_11_0},
+ .flags = OPT_FLAG_SETTABLE,
+ .tags = {"security" , "linux"},
},
{ .key = { NULL }, }
};
diff --git a/xlators/features/trash/src/trash.c b/xlators/features/trash/src/trash.c
index f3d2e63b1b2..3baa828143a 100644
--- a/xlators/features/trash/src/trash.c
+++ b/xlators/features/trash/src/trash.c
@@ -2652,28 +2652,47 @@ struct volume_options options[] = {
.type = GF_OPTION_TYPE_BOOL,
.default_value = "off",
.description = "Enable/disable trash translator",
+ .op_version = {GD_OP_VERSION_3_7_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC,
+ .tags = {"backup"},
},
{ .key = { "trash-dir" },
.type = GF_OPTION_TYPE_STR,
.default_value = ".trashcan",
.description = "Directory for trash files",
+ .op_version = {GD_OP_VERSION_3_7_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC,
+ .tags = {"backup"},
},
{ .key = { "trash-eliminate-path" },
.type = GF_OPTION_TYPE_STR,
.description = "Eliminate paths to be excluded "
"from trashing",
+ .op_version = {GD_OP_VERSION_3_7_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC,
+ .tags = {"backup"},
},
{ .key = { "trash-max-filesize" },
.type = GF_OPTION_TYPE_SIZET,
.default_value = "5MB",
.description = "Maximum size of file that can be "
"moved to trash",
+ .op_version = {GD_OP_VERSION_3_7_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC,
+ .tags = {"backup"},
},
{ .key = { "trash-internal-op" },
.type = GF_OPTION_TYPE_BOOL,
.default_value = "off",
.description = "Enable/disable trash translator for "
"internal operations",
+ .op_version = {GD_OP_VERSION_3_7_0},
+ .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC,
+ .tags = {"backup"},
+ },
+ { .key = {"brick-path"},
+ .type = GF_OPTION_TYPE_PATH,
+ .default_value = "{{ brick.path }}"
},
{ .key = {NULL} },
};