diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-02-12 14:22:44 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-02-12 14:22:44 +0000 |
| commit | 6f70878428a80e83775ad270d9b856d4a4fe3f54 (patch) | |
| tree | 63ddc92b76d3b2e527de1e7dba67d2db9bd4f7d1 | |
| parent | 169927a652bbebf0671ac7df13ef87ae0b42b35f (diff) | |
| download | illumos-joyent-6f70878428a80e83775ad270d9b856d4a4fe3f54.tar.gz | |
6889 & 10330 [fix merge problems]
| -rw-r--r-- | usr/src/cmd/zdb/zdb.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libctf/common/ctf_convert.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libctf/common/libctf.h | 2 | ||||
| -rw-r--r-- | usr/src/lib/libctf/common/mapfile-vers | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/usr/src/cmd/zdb/zdb.c b/usr/src/cmd/zdb/zdb.c index 0e8fc3b9fd..b591cc89a2 100644 --- a/usr/src/cmd/zdb/zdb.c +++ b/usr/src/cmd/zdb/zdb.c @@ -901,7 +901,7 @@ dump_metaslab(metaslab_t *msp) if (dump_opt['m'] > 2 && !dump_opt['L']) { mutex_enter(&msp->ms_lock); - VERIFY0(metaslab_load(msp)); + VERIFY0(metaslab_load(msp, 0)); range_tree_stat_verify(msp->ms_allocatable); dump_metaslab_stats(msp); metaslab_unload(msp); diff --git a/usr/src/lib/libctf/common/ctf_convert.c b/usr/src/lib/libctf/common/ctf_convert.c index cbb4d48c76..1a433d17db 100644 --- a/usr/src/lib/libctf/common/ctf_convert.c +++ b/usr/src/lib/libctf/common/ctf_convert.c @@ -101,7 +101,7 @@ ctf_convert_ftypes(Elf *elf, ctf_convert_source_t *types) } } -static ctf_file_t * +ctf_file_t * ctf_elfconvert(int fd, Elf *elf, const char *label, uint_t nthrs, uint_t flags, int *errp, char *errbuf, size_t errlen) { diff --git a/usr/src/lib/libctf/common/libctf.h b/usr/src/lib/libctf/common/libctf.h index f4960eef0a..a5c5027048 100644 --- a/usr/src/lib/libctf/common/libctf.h +++ b/usr/src/lib/libctf/common/libctf.h @@ -76,6 +76,8 @@ extern int ctf_diff_objects(ctf_diff_t *, ctf_diff_obj_f, void *); extern void ctf_diff_fini(ctf_diff_t *); #define CTF_CONVERT_F_IGNNONC 0x01 +extern ctf_file_t *ctf_elfconvert(int, Elf *, const char *, uint_t, uint_t, + int *, char *, size_t); extern ctf_file_t *ctf_fdconvert(int, const char *, uint_t, uint_t, int *, char *, size_t); diff --git a/usr/src/lib/libctf/common/mapfile-vers b/usr/src/lib/libctf/common/mapfile-vers index b26ee8ceb4..243f072a3d 100644 --- a/usr/src/lib/libctf/common/mapfile-vers +++ b/usr/src/lib/libctf/common/mapfile-vers @@ -78,6 +78,7 @@ SYMBOL_VERSION SUNWprivate_1.2 { ctf_diff_types; ctf_discard; ctf_dup; + ctf_elfconvert; ctf_elffdwrite; ctf_elfwrite; ctf_enum_value; |