diff options
| author | delphij <delphij@FreeBSD.org> | 2014-09-25 21:07:30 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-09-25 21:07:30 +0000 |
| commit | 93af829dad4816366c39e80c6f9f2a648215cd96 (patch) | |
| tree | 3beb775748e98efedfaac5da1d2c4110ffd7abd5 /sys/cddl | |
| parent | add3b9019927b06376be5c8503256c96687625ef (diff) | |
| download | FreeBSD-src-93af829dad4816366c39e80c6f9f2a648215cd96.zip FreeBSD-src-93af829dad4816366c39e80c6f9f2a648215cd96.tar.gz | |
MFC r271534: 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
Approved by: re (gjb)
Diffstat (limited to 'sys/cddl')
| -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 e28663a..150dfb2 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c @@ -647,7 +647,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); } |
