diff options
| author | Brian Behlendorf <[email protected]> | 2012-10-26 10:01:49 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-10-29 08:57:45 -0700 |
| commit | e8fd45a0f975c6b8ae8cd644714fc21f14fac2bf (patch) | |
| tree | 59aa8971d8aba6dcd8b173d630ffb71b61e8e573 /cmd | |
| parent | 178e73b376297be44253f7655cd8cba3cf082171 (diff) | |
Add ddt_object_count() error handling
The interface for the ddt_zap_count() function assumes it can
never fail. However, internally ddt_zap_count() is implemented
with zap_count() which can potentially fail. Now because there
was no way to return the error to the caller a VERIFY was used
to ensure this case never happens.
Unfortunately, it has been observed that pools can be damaged in
such a way that zap_count() fails. The result is that the pool can
not be imported without hitting the VERIFY and crashing the system.
This patch reworks ddt_object_count() so the error can be safely
caught and returned to the caller. This allows a pool which has
be damaged in this way to be safely rewound for import.
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #910
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/zdb/zdb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c index 4a36732ff..ce6318ea1 100644 --- a/cmd/zdb/zdb.c +++ b/cmd/zdb/zdb.c @@ -698,7 +698,9 @@ dump_ddt(ddt_t *ddt, enum ddt_type type, enum ddt_class class) return; ASSERT(error == 0); - if ((count = ddt_object_count(ddt, type, class)) == 0) + error = ddt_object_count(ddt, type, class, &count); + ASSERT(error == 0); + if (count == 0) return; dspace = doi.doi_physical_blocks_512 << 9; |