aboutsummaryrefslogtreecommitdiffstats
path: root/include/sys/uberblock.h
diff options
context:
space:
mode:
authorMatthew Ahrens <mahrens@delphix.com>2015-07-11 02:19:41 +0200
committerBrian Behlendorf <behlendorf1@llnl.gov>2015-07-14 10:35:21 -0700
commit905edb405da278ccb019c656408f82796a344510 (patch)
tree156f806c86f7ad50155e73fb8edb295d653f2ea5 /include/sys/uberblock.h
parent93f6d7e2e5050ee8894c0ae5e7c91aa74187cd86 (diff)
Illumos 5347 - idle pool may run itself out of space
5347 idle pool may run itself out of space Reviewed by: Alex Reece <alex.reece@delphix.com> Reviewed by: George Wilson <george.wilson@delphix.com> Reviewed by: Steven Hartland <killing@multiplay.co.uk> Reviewed by: Richard Elling <richard.elling@richardelling.com> Approved by: Dan McDonald <danmcd@omniti.com> References: https://github.com/illumos/illumos-gate/commit/231aab8 https://github.com/illumos/illumos-gate/commit/4a92375 3642 https://www.illumos.org/issues/5347 https://github.com/zfsonlinux/zfs/commit/89b1cd6 (partial commit & fix) https://github.com/zfsonlinux/zfs/commit/fbeddd6 Illumos 4390 https://github.com/zfsonlinux/zfs/commit/2696dfa Illumos 3642, 3643 Porting notes: This is completing the partial fix from FreeBSD Ported-by: kernelOfTruth kerneloftruth@gmail.com Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #3586
Diffstat (limited to 'include/sys/uberblock.h')
-rw-r--r--include/sys/uberblock.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/sys/uberblock.h b/include/sys/uberblock.h
index b5bb91573..21e7ae0de 100644
--- a/include/sys/uberblock.h
+++ b/include/sys/uberblock.h
@@ -22,6 +22,9 @@
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
+/*
+ * Copyright (c) 2014 by Delphix. All rights reserved.
+ */
#ifndef _SYS_UBERBLOCK_H
#define _SYS_UBERBLOCK_H
@@ -36,8 +39,8 @@ extern "C" {
typedef struct uberblock uberblock_t;
-extern int uberblock_verify(uberblock_t *ub);
-extern int uberblock_update(uberblock_t *ub, vdev_t *rvd, uint64_t txg);
+extern int uberblock_verify(uberblock_t *);
+extern boolean_t uberblock_update(uberblock_t *, vdev_t *, uint64_t);
#ifdef __cplusplus
}