summaryrefslogtreecommitdiffstats
path: root/sys/geom
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2011-05-08 09:25:54 +0000
committerpjd <pjd@FreeBSD.org>2011-05-08 09:25:54 +0000
commitca83b3035dd29544f0d84f110b194173f580e9d9 (patch)
treecc3422057a3a2c2542f16892f99f20c68e7778cc /sys/geom
parentb2b06929c84acd5b59f54c25025bfb81e6f04796 (diff)
downloadFreeBSD-src-ca83b3035dd29544f0d84f110b194173f580e9d9.zip
FreeBSD-src-ca83b3035dd29544f0d84f110b194173f580e9d9.tar.gz
Version 6 is compatible with version 5 when it comes to control commands.
MFC after: 1 week
Diffstat (limited to 'sys/geom')
-rw-r--r--sys/geom/eli/g_eli_ctl.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/geom/eli/g_eli_ctl.c b/sys/geom/eli/g_eli_ctl.c
index a5de30b..65672d5 100644
--- a/sys/geom/eli/g_eli_ctl.c
+++ b/sys/geom/eli/g_eli_ctl.c
@@ -1014,7 +1014,12 @@ g_eli_config(struct gctl_req *req, struct g_class *mp, const char *verb)
gctl_error(req, "No '%s' argument.", "version");
return;
}
- if (*version != G_ELI_VERSION) {
+ while (*version != G_ELI_VERSION) {
+ if (G_ELI_VERSION == G_ELI_VERSION_06 &&
+ *version == G_ELI_VERSION_05) {
+ /* Compatible. */
+ break;
+ }
gctl_error(req, "Userland and kernel parts are out of sync.");
return;
}
OpenPOWER on IntegriCloud