diff options
| author | Brian Behlendorf <[email protected]> | 2008-12-22 11:09:07 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2008-12-22 11:09:07 -0800 |
| commit | 1419a88378bf2771fead8f6a3887dd9d4b4ec6bf (patch) | |
| tree | 0239d90d2d46855da19db86cd1a258c0dac19924 /cmd | |
| parent | c73c225a4a93517d2f8b1c4ccb74ad2d53cc0dfa (diff) | |
| parent | feb8953178a6a3738e4097bb799e673beaefc9b8 (diff) | |
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/zdb/Makefile.am | 9 | ||||
| -rw-r--r-- | cmd/zdb/zdb.c | 1 | ||||
| -rw-r--r-- | cmd/zdb/zdb_il.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/cmd/zdb/Makefile.am b/cmd/zdb/Makefile.am index 0d64301ee..5a88fcc15 100644 --- a/cmd/zdb/Makefile.am +++ b/cmd/zdb/Makefile.am @@ -17,4 +17,11 @@ zdb_SOURCES = \ ${top_srcdir}/cmd/zdb/zdb_il.c zdb_LDADD = \ - $(top_builddir)/lib/libspl/libspl.la + $(top_builddir)/lib/libspl/libspl.la \ + $(top_builddir)/lib/libavl/libavl.la \ + $(top_builddir)/lib/libnvpair/libnvpair.la \ + $(top_builddir)/lib/libuutil/libuutil.la \ + $(top_builddir)/lib/libzpool/libzpool.la \ + $(top_builddir)/lib/libzfs/libzfs.la + +zdb_LDFLAGS = diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c index 5902084a9..42ab2b416 100644 --- a/cmd/zdb/zdb.c +++ b/cmd/zdb/zdb.c @@ -52,7 +52,6 @@ #include <sys/zfs_fuid.h> #include <sys/arc.h> #undef ZFS_MAXNAMELEN -#undef verify #include <libzfs.h> const char cmdname[] = "zdb"; diff --git a/cmd/zdb/zdb_il.c b/cmd/zdb/zdb_il.c index 02d35a050..9341e81c3 100644 --- a/cmd/zdb/zdb_il.c +++ b/cmd/zdb/zdb_il.c @@ -225,7 +225,7 @@ zil_prt_rec_acl(zilog_t *zilog, int txtype, lr_acl_t *lr) (u_longlong_t)lr->lr_foid, (u_longlong_t)lr->lr_aclcnt); } -typedef void (*zil_prt_rec_func_t)(); +typedef void (*zil_prt_rec_func_t)(zilog_t *, int, lr_t *); typedef struct zil_rec_info { zil_prt_rec_func_t zri_print; char *zri_name; |