From owner-svn-src-head@FreeBSD.ORG  Sun Sep 19 10:45:54 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1E510106564A;
	Sun, 19 Sep 2010 10:45:54 +0000 (UTC)
	(envelope-from brian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0DF368FC13;
	Sun, 19 Sep 2010 10:45:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8JAjr4q098982;
	Sun, 19 Sep 2010 10:45:53 GMT (envelope-from brian@svn.freebsd.org)
Received: (from brian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8JAjrud098980;
	Sun, 19 Sep 2010 10:45:53 GMT (envelope-from brian@svn.freebsd.org)
Message-Id: <201009191045.o8JAjrud098980@svn.freebsd.org>
From: Brian Somers <brian@FreeBSD.org>
Date: Sun, 19 Sep 2010 10:45:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212845 - head/sys/geom/eli
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Sep 2010 10:45:54 -0000

Author: brian
Date: Sun Sep 19 10:45:53 2010
New Revision: 212845
URL: http://svn.freebsd.org/changeset/base/212845

Log:
  Support attaching version 4 metadata
  
  Reviewed by:	pjd

Modified:
  head/sys/geom/eli/g_eli.h

Modified: head/sys/geom/eli/g_eli.h
==============================================================================
--- head/sys/geom/eli/g_eli.h	Sun Sep 19 09:19:38 2010	(r212844)
+++ head/sys/geom/eli/g_eli.h	Sun Sep 19 10:45:53 2010	(r212845)
@@ -228,8 +228,9 @@ eli_metadata_decode_v0(const u_char *dat
 		return (EINVAL);
 	return (0);
 }
+
 static __inline int
-eli_metadata_decode_v1v2v3(const u_char *data, struct g_eli_metadata *md)
+eli_metadata_decode_v1v2v3v4(const u_char *data, struct g_eli_metadata *md)
 {
 	MD5_CTX ctx;
 	const u_char *p;
@@ -266,7 +267,8 @@ eli_metadata_decode(const u_char *data, 
 	case 1:
 	case 2:
 	case 3:
-		error = eli_metadata_decode_v1v2v3(data, md);
+	case 4:
+		error = eli_metadata_decode_v1v2v3v4(data, md);
 		break;
 	default:
 		error = EINVAL;