Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 8 May 2011 09:25:54 +0000 (UTC)
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r221630 - head/sys/geom/eli
Message-ID:  <201105080925.p489PsFt038353@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pjd
Date: Sun May  8 09:25:54 2011
New Revision: 221630
URL: http://svn.freebsd.org/changeset/base/221630

Log:
  Version 6 is compatible with version 5 when it comes to control commands.
  
  MFC after:	1 week

Modified:
  head/sys/geom/eli/g_eli_ctl.c

Modified: head/sys/geom/eli/g_eli_ctl.c
==============================================================================
--- head/sys/geom/eli/g_eli_ctl.c	Sun May  8 09:25:16 2011	(r221629)
+++ head/sys/geom/eli/g_eli_ctl.c	Sun May  8 09:25:54 2011	(r221630)
@@ -1014,7 +1014,12 @@ g_eli_config(struct gctl_req *req, struc
 		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;
 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105080925.p489PsFt038353>