Imported Upstream version 0.6.5.3

[mirror_zfs-debian.git] / module / zfs / zio_inject.c

diff --git a/module/zfs/zio_inject.c b/module/zfs/zio_inject.c
index 5afb23c595aeddef4cb1a0f0ed3547dab81eb1d9..40b507a0b6d83f3803c2cc07dfafd943312ad1e5 100644 (file)
--- a/module/zfs/zio_inject.c
+++ b/module/zfs/zio_inject.c
@@ -439,7 +439,11 @@ zio_inject_fault(char *name, int flags, int *id, zinject_record_t *record)
         * fault injection isn't a performance critical path.
         */
        if (flags & ZINJECT_FLUSH_ARC)
-               arc_flush(NULL);
+               /*
+                * We must use FALSE to ensure arc_flush returns, since
+                * we're not preventing concurrent ARC insertions.
+                */
+               arc_flush(NULL, FALSE);
 
        return (0);
 }