diff options
| author | delphij <delphij@FreeBSD.org> | 2014-09-13 17:36:34 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-09-13 17:36:34 +0000 |
| commit | 9cdf61a6da9c49a596f561cb9c6c9b423c0dc512 (patch) | |
| tree | b78e699b8a86652837ddfa2323f9dbe7be6f2e42 | |
| parent | b157123631b928ffeb6fd3a56c3aed0ef7b09cef (diff) | |
| download | FreeBSD-src-9cdf61a6da9c49a596f561cb9c6c9b423c0dc512.zip FreeBSD-src-9cdf61a6da9c49a596f561cb9c6c9b423c0dc512.tar.gz | |
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
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c index 228e459..c26e53c 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c @@ -644,7 +644,14 @@ zil_claim(const char *osname, void *txarg) 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); } |
