Add load_nvlist() error handling

Add the missing error handling to load_nvlist().  There's no good
reason this needs to be fatal.  All callers of load_nvlist() do
correctly handle an error condition and it is preferable that an
error be returned.  This will allow 'zpool import -FX' to safely
attempt to rollback through previous txgs looking for a good one.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1120

diff --git a/module/zfs/spa.c b/module/zfs/spa.c
index 33798d3aff5fdee9d196484de4e4f8b7c7ac645b..b610a0dae6bfd640dd479bba7f49b41eefb63173 100644 (file)
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@ -1350,7 +1350,10 @@ load_nvlist(spa_t *spa, uint64_t obj, nvlist_t **value)
        int error;
        *value = NULL;
 
-       VERIFY(0 == dmu_bonus_hold(spa->spa_meta_objset, obj, FTAG, &db));
+       error = dmu_bonus_hold(spa->spa_meta_objset, obj, FTAG, &db);
+       if (error)
+               return (error);
+
        nvsize = *(uint64_t *)db->db_data;
        dmu_buf_rele(db, FTAG);