Rebase master to b105

[zfs.git] / module / zfs / arc.c

diff --git a/module/zfs/arc.c b/module/zfs/arc.c
index 73aecb2..464fe9f 100644 (file)
--- a/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@ -3491,6 +3491,7 @@ arc_fini(void)
        mutex_destroy(&arc_mru_ghost->arcs_mtx);
        mutex_destroy(&arc_mfu->arcs_mtx);
        mutex_destroy(&arc_mfu_ghost->arcs_mtx);
+       mutex_destroy(&arc_l2c_only->arcs_mtx);
 
        mutex_destroy(&zfs_write_limit_lock);
 
@@ -4457,7 +4458,7 @@ l2arc_fini(void)
 void
 l2arc_start(void)
 {
-       if (!(spa_mode & FWRITE))
+       if (!(spa_mode_global & FWRITE))
                return;
 
        (void) thread_create(NULL, 0, l2arc_feed_thread, NULL, 0, &p0,
@@ -4467,7 +4468,7 @@ l2arc_start(void)
 void
 l2arc_stop(void)
 {
-       if (!(spa_mode & FWRITE))
+       if (!(spa_mode_global & FWRITE))
                return;
 
        mutex_enter(&l2arc_feed_thr_lock);