--- a/usr/src/grub/grub-0.97/stage2/fsys_zfs.c Mon Mar 29 15:03:11 2010 -0600
+++ b/usr/src/grub/grub-0.97/stage2/fsys_zfs.c Mon Mar 29 15:37:28 2010 -0600
@@ -1436,7 +1436,6 @@
sa_hdr_phys_t *sahdrp;
int hdrsize;
- sahdrp = (sa_hdr_phys_t *)DN_BONUS(DNODE);
if (DNODE->dn_bonuslen != 0) {
sahdrp = (sa_hdr_phys_t *)DN_BONUS(DNODE);
} else {
--- a/usr/src/grub/grub-0.97/stage2/zfs-include/dmu.h Mon Mar 29 15:03:11 2010 -0600
+++ b/usr/src/grub/grub-0.97/stage2/zfs-include/dmu.h Mon Mar 29 15:37:28 2010 -0600
@@ -56,7 +56,7 @@
DMU_OT_DSL_DATASET, /* UINT64 */
/* zpl: */
DMU_OT_ZNODE, /* ZNODE */
- DMU_OT_ACL, /* ACL */
+ DMU_OT_OLDACL, /* OLD ACL */
DMU_OT_PLAIN_FILE_CONTENTS, /* UINT8 */
DMU_OT_DIRECTORY_CONTENTS, /* ZAP */
DMU_OT_MASTER_NODE, /* ZAP */
--- a/usr/src/grub/grub-0.97/stage2/zfs-include/sa_impl.h Mon Mar 29 15:03:11 2010 -0600
+++ b/usr/src/grub/grub-0.97/stage2/zfs-include/sa_impl.h Mon Mar 29 15:37:28 2010 -0600
@@ -1,28 +1,25 @@
/*
- * CDDL HEADER START
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
*
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/*
* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-
#ifndef _SYS_SA_IMPL_H
#define _SYS_SA_IMPL_H