c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add ddt_object_load() error handling

Browse Source 
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
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/zfs/ddt.c
View File

@ -120,7 +120,9 @@ ddt_object_load(ddt_t *ddt, enum ddt_type type, enum ddt_class class)
/* /*
* Seed the cached statistics. * 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_count = ddt_object_count(ddt, type, class);
ddo->ddo_dspace = doi.doi_physical_blocks_512 << 9; ddo->ddo_dspace = doi.doi_physical_blocks_512 << 9;