diff options
| author | delphij <delphij@FreeBSD.org> | 2014-07-01 07:29:42 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-07-01 07:29:42 +0000 |
| commit | 0d7d731791d57691c640cdbdae4769591b0f68eb (patch) | |
| tree | 75a08d29a175da4784b14b056b7b882ec1e5b1a1 /cddl/contrib | |
| parent | c07ae1789a4d3c79a2a95545833b8efc631a3e97 (diff) | |
| download | FreeBSD-src-0d7d731791d57691c640cdbdae4769591b0f68eb.zip FreeBSD-src-0d7d731791d57691c640cdbdae4769591b0f68eb.tar.gz | |
MFV r267566:
4390 i/o errors when deleting filesystem/zvol can lead to space map corruption
MFC after: 2 weeks
Diffstat (limited to 'cddl/contrib')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zdb/zdb.c | 4 | ||||
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zdb/zdb.c b/cddl/contrib/opensolaris/cmd/zdb/zdb.c index 6346635..5974878 100644 --- a/cddl/contrib/opensolaris/cmd/zdb/zdb.c +++ b/cddl/contrib/opensolaris/cmd/zdb/zdb.c @@ -75,9 +75,9 @@ DMU_OT_ZAP_OTHER : DMU_OT_NUMTYPES)) #ifndef lint -extern int zfs_recover; +extern boolean_t zfs_recover; #else -int zfs_recover; +boolean_t zfs_recover; #endif const char cmdname[] = "zdb"; diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c index 02f0b96..c344c94 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c @@ -303,6 +303,7 @@ zpool_get_prop(zpool_handle_t *zhp, zpool_prop_t prop, char *buf, size_t len, case ZPOOL_PROP_ALLOCATED: case ZPOOL_PROP_FREE: case ZPOOL_PROP_FREEING: + case ZPOOL_PROP_LEAKED: case ZPOOL_PROP_EXPANDSZ: if (literal) { (void) snprintf(buf, len, "%llu", |
