Add ddt_object_load() error handling

Add the missing error handling to ddt_object_load().  There's no
good reason this needs to be fatal.  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>
This commit is contained in:
Brian Behlendorf 2012-07-19 14:50:25 -07:00
parent 10be533e33
commit 2a4a9dc2f0

View File

@ -120,7 +120,9 @@ ddt_object_load(ddt_t *ddt, enum ddt_type type, enum ddt_class class)
/*
* Seed the cached statistics.
*/
VERIFY(ddt_object_info(ddt, type, class, &doi) == 0);
error = ddt_object_info(ddt, type, class, &doi);
if (error)
return (error);
ddo->ddo_count = ddt_object_count(ddt, type, class);
ddo->ddo_dspace = doi.doi_physical_blocks_512 << 9;