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

[Alexander Motin]

Author: mav
Date: Sat Oct  3 07:46:03 2015
New Revision: 288558
URL: https://svnweb.freebsd.org/changeset/base/288558

Log:
  MFC r286600: 5808 spa_check_logs is not necessary on readonly pools
  
  Reviewed by: George Wilson <george at delphix.com>
  Reviewed by: Paul Dagnelie <paul.dagnelie at delphix.com>
  Reviewed by: Simon Klinkert <simon.klinkert at gmail.com>
  Reviewed by: Will Andrews <will at freebsd.org>
  Approved by: Gordon Ross <gwr at nexenta.com>
  Author: Matthew Ahrens <mahrens at delphix.com>
  
  illumos/illumos-gate at 23367a2f2caec1ccb4d918bdd0f2fc2c9cadcd06

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

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Sat Oct  3 07:45:12 2015	(r288557)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Sat Oct  3 07:46:03 2015	(r288558)
@@ -2752,7 +2752,7 @@ spa_load_impl(spa_t *spa, uint64_t pool_
 		if (rvd->vdev_state <= VDEV_STATE_CANT_OPEN)
 			return (SET_ERROR(ENXIO));
 
-		if (spa_check_logs(spa)) {
+		if (spa_writeable(spa) && spa_check_logs(spa)) {
 			*ereport = FM_EREPORT_ZFS_LOG_REPLAY;
 			return (spa_vdev_err(rvd, VDEV_AUX_BAD_LOG, ENXIO));
 		}