]> granicus.if.org Git - zfs/commitdiff
Illumos 5808 - spa_check_logs is not necessary on readonly pools
authorMatthew Ahrens <mahrens@delphix.com>
Sun, 26 Apr 2015 22:24:34 +0000 (15:24 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 4 May 2015 17:45:42 +0000 (10:45 -0700)
5808 spa_check_logs is not necessary on readonly pools
Reviewed by: George Wilson <george@delphix.com>
Reviewed by: Paul Dagnelie <paul.dagnelie@delphix.com>
Reviewed by: Simon Klinkert <simon.klinkert@gmail.com>
Reviewed by: Will Andrews <will@freebsd.org>
Approved by: Gordon Ross <gwr@nexenta.com>

References:
  https://www.illumos.org/issues/5808
  https://github.com/illumos/illumos-gate/commit/23367a2f

Ported-by: DHE <git@dehacked.net>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3369

module/zfs/spa.c

index 53aa05d01fb1d08fffb8c55f06a8d4562118a818..3312c301cb9a5c5c1282ee3d05e607c1d26a5900 100644 (file)
@@ -2714,7 +2714,7 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
                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));
                }