Author: delphij
Date: Sat Sep 13 17:36:34 2014
New Revision: 271534
URL: http://svnweb.freebsd.org/changeset/base/271534
Log:
MFV r271517:
In zil_claim, don't issue warning if we get EBUSY (inconsistent) when
opening an objset, instead, ignore it silently.
Illumos issue:
5140 message about "%recv could not be opened" is printed when booting
after crash
MFC after: 1 week
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
Directory Properties:
head/sys/cddl/contrib/opensolaris/ (props changed)
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Sat Sep 13
17:30:46 2014 (r271533)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Sat Sep 13
17:36:34 2014 (r271534)
@@ -644,7 +644,14 @@ zil_claim(const char *osname, void *txar
error = dmu_objset_own(osname, DMU_OST_ANY, B_FALSE, FTAG, &os);
if (error != 0) {
- cmn_err(CE_WARN, "can't open objset for %s", osname);
+ /*
+ * EBUSY indicates that the objset is inconsistent, in which
+ * case it can not have a ZIL.
+ */
+ if (error != EBUSY) {
+ cmn_err(CE_WARN, "can't open objset for %s, error %u",
+ osname, error);
+ }
return (0);
}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
