svn commit: r272133 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Thu Sep 25 21:07:30 2014
New Revision: 272133
URL: http://svnweb.freebsd.org/changeset/base/272133

Log:
  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)

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c	Thu Sep 25 21:07:19 2014	(r272132)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c	Thu Sep 25 21:07:30 2014	(r272133)
@@ -647,7 +647,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);
 	}