svn commit: r271517 - vendor-sys/illumos/dist/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Sat Sep 13 15:31:37 2014
New Revision: 271517
URL: http://svnweb.freebsd.org/changeset/base/271517

Log:
  5140 message about "%recv could not be opened" is printed when booting after crash
  Reviewed by: Christopher Siden <christopher.siden at delphix.com>
  Reviewed by: George Wilson <george.wilson at delphix.com>
  Reviewed by: Max Grossman <max.grossman at delphix.com>
  Reviewed by: Richard Elling <richard.elling at gmail.com>
  Approved by: Dan McDonald <danmcd at omniti.com>
  Author: Matthew Ahrens <mahrens at delphix.com>
  
  illumos/illumos-gate at 22438533bcc131ecebd4c16c699c35e91d321b76

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/zil.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zil.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zil.c	Sat Sep 13 15:27:46 2014	(r271516)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zil.c	Sat Sep 13 15:31:37 2014	(r271517)
@@ -635,7 +635,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);
 	}