Rebase master to b117

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

diff --git a/module/zfs/spa_history.c b/module/zfs/spa_history.c
index c997240..97d97d8 100644 (file)
--- a/module/zfs/spa_history.c
+++ b/module/zfs/spa_history.c
@@ -20,12 +20,10 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident  "%Z%%M% %I%     %E% SMI"
-
 #include <sys/spa.h>
 #include <sys/spa_impl.h>
 #include <sys/zap.h>
@@ -127,12 +125,12 @@ spa_history_advance_bof(spa_t *spa, spa_history_phys_t *shpp)
        firstread = MIN(sizeof (reclen), shpp->sh_phys_max_off - phys_bof);
 
        if ((err = dmu_read(mos, spa->spa_history, phys_bof, firstread,
-           buf)) != 0)
+           buf, DMU_READ_PREFETCH)) != 0)
                return (err);
        if (firstread != sizeof (reclen)) {
                if ((err = dmu_read(mos, spa->spa_history,
                    shpp->sh_pool_create_len, sizeof (reclen) - firstread,
-                   buf + firstread)) != 0)
+                   buf + firstread, DMU_READ_PREFETCH)) != 0)
                        return (err);
        }
 
@@ -380,10 +378,11 @@ spa_history_get(spa_t *spa, uint64_t *offp, uint64_t *len, char *buf)
                return (0);
        }
 
-       err = dmu_read(mos, spa->spa_history, phys_read_off, read_len, buf);
+       err = dmu_read(mos, spa->spa_history, phys_read_off, read_len, buf,
+           DMU_READ_PREFETCH);
        if (leftover && err == 0) {
                err = dmu_read(mos, spa->spa_history, shpp->sh_pool_create_len,
-                   leftover, buf + read_len);
+                   leftover, buf + read_len, DMU_READ_PREFETCH);
        }
        mutex_exit(&spa->spa_history_lock);