diff options
author | Pawel Jakub Dawidek <pjd@FreeBSD.org> | 2011-02-27 19:41:40 +0000 |
---|---|---|
committer | Pawel Jakub Dawidek <pjd@FreeBSD.org> | 2011-02-27 19:41:40 +0000 |
commit | 10b9d77bf1ccf2f3affafa6261692cb92cf7e992 (patch) | |
tree | ef515cadc08bf427e4d3f1360199ec9827b1596b /cddl/contrib/opensolaris/cmd/zfs/zfs_util.h | |
parent | e02dd14a548a89bee6657d9eacb0f992bf61b280 (diff) | |
download | src-10b9d77bf1ccf2f3affafa6261692cb92cf7e992.tar.gz src-10b9d77bf1ccf2f3affafa6261692cb92cf7e992.zip |
Finally... Import the latest open-source ZFS version - (SPA) 28.
Few new things available from now on:
- Data deduplication.
- Triple parity RAIDZ (RAIDZ3).
- zfs diff.
- zpool split.
- Snapshot holds.
- zpool import -F. Allows to rewind corrupted pool to earlier
transaction group.
- Possibility to import pool in read-only mode.
MFC after: 1 month
Notes
Notes:
svn path=/head/; revision=219089
Diffstat (limited to 'cddl/contrib/opensolaris/cmd/zfs/zfs_util.h')
-rw-r--r-- | cddl/contrib/opensolaris/cmd/zfs/zfs_util.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h b/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h index c7f2f1618647..3ddff9e22d7d 100644 --- a/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h +++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h @@ -19,15 +19,12 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. */ #ifndef _ZFS_UTIL_H #define _ZFS_UTIL_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <libzfs.h> #ifdef __cplusplus @@ -35,6 +32,7 @@ extern "C" { #endif void * safe_malloc(size_t size); +void nomem(void); libzfs_handle_t *g_zfs; #ifdef __cplusplus |