git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rebase to OpenSolaris b103, in the process we are removing any code which did not...
[zfs.git]
/
zfs
/
lib
/
libzpool
/
spa_errlog.c
diff --git
a/zfs/lib/libzpool/spa_errlog.c
b/zfs/lib/libzpool/spa_errlog.c
index
1628454
..
c642bd7
100644
(file)
--- a/
zfs/lib/libzpool/spa_errlog.c
+++ b/
zfs/lib/libzpool/spa_errlog.c
@@
-19,11
+19,11
@@
* CDDL HEADER END
*/
/*
* CDDL HEADER END
*/
/*
- * Copyright 200
6
Sun Microsystems, Inc. All rights reserved.
+ * Copyright 200
8
Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
* Use is subject to license terms.
*/
-#pragma ident "
@(#)spa_errlog.c 1.2 06/10/02
SMI"
+#pragma ident "
%Z%%M% %I% %E%
SMI"
/*
* Routines to manage the on-disk persistent error log.
/*
* Routines to manage the on-disk persistent error log.
@@
-298,10
+298,7
@@
void
spa_errlog_rotate(spa_t *spa)
{
mutex_enter(&spa->spa_errlist_lock);
spa_errlog_rotate(spa_t *spa)
{
mutex_enter(&spa->spa_errlist_lock);
-
- ASSERT(!spa->spa_scrub_finished);
spa->spa_scrub_finished = B_TRUE;
spa->spa_scrub_finished = B_TRUE;
-
mutex_exit(&spa->spa_errlist_lock);
}
mutex_exit(&spa->spa_errlist_lock);
}