Illumos #3598

[mirror_zfs.git] / module / zfs / dmu_tx.c

diff --git a/module/zfs/dmu_tx.c b/module/zfs/dmu_tx.c
index 7b62239567f5d95b9550b92eb93593c511a88f04..1cad8d20e6ad0e883644704ee8b9cb95f4264608 100644 (file)
--- a/module/zfs/dmu_tx.c
+++ b/module/zfs/dmu_tx.c
@@ -176,7 +176,7 @@ dmu_tx_check_ioerr(zio_t *zio, dnode_t *dn, int level, uint64_t blkid)
        db = dbuf_hold_level(dn, level, blkid, FTAG);
        rw_exit(&dn->dn_struct_rwlock);
        if (db == NULL)
-               return (EIO);
+               return (SET_ERROR(EIO));
        err = dbuf_read(db, zio, DB_RF_CANFAIL | DB_RF_NOPREFETCH);
        dbuf_rele(db, FTAG);
        return (err);
@@ -387,7 +387,7 @@ dmu_tx_count_write(dmu_tx_hold_t *txh, uint64_t off, uint64_t len)
 out:
        if (txh->txh_space_towrite + txh->txh_space_tooverwrite >
            2 * DMU_MAX_ACCESS)
-               err = EFBIG;
+               err = SET_ERROR(EFBIG);
 
        if (err)
                txh->txh_tx->tx_err = err;
@@ -945,9 +945,9 @@ dmu_tx_try_assign(dmu_tx_t *tx, txg_how_t txg_how)
                 */
                if (spa_get_failmode(spa) == ZIO_FAILURE_MODE_CONTINUE &&
                    txg_how != TXG_WAIT)
-                       return (EIO);
+                       return (SET_ERROR(EIO));
 
-               return (ERESTART);
+               return (SET_ERROR(ERESTART));
        }
 
        tx->tx_txg = txg_hold_open(tx->tx_pool, &tx->tx_txgh);
@@ -969,7 +969,7 @@ dmu_tx_try_assign(dmu_tx_t *tx, txg_how_t txg_how)
                                mutex_exit(&dn->dn_mtx);
                                tx->tx_needassign_txh = txh;
                                DMU_TX_STAT_BUMP(dmu_tx_group);
-                               return (ERESTART);
+                               return (SET_ERROR(ERESTART));
                        }
                        if (dn->dn_assigned_txg == 0)
                                dn->dn_assigned_txg = tx->tx_txg;