From 4bf318d0a85309fb0ace09decb75ab0102ff383c Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 22 Dec 2008 11:00:47 -0800 Subject: [PATCH 1/4] Add needed libs --- cmd/zdb/Makefile.am | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cmd/zdb/Makefile.am b/cmd/zdb/Makefile.am index 0d64301eec..5a88fcc151 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 = From 09de417e20ff2fb3890d75f4f7f415e6007db10c Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 22 Dec 2008 11:01:35 -0800 Subject: [PATCH 2/4] Move #endif up to expose userspace bits --- module/zfs/include/sys/zfs_fuid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/zfs/include/sys/zfs_fuid.h b/module/zfs/include/sys/zfs_fuid.h index 41f5846f5c..7ef8dd7a30 100644 --- a/module/zfs/include/sys/zfs_fuid.h +++ b/module/zfs/include/sys/zfs_fuid.h @@ -114,6 +114,7 @@ extern zfs_fuid_info_t *zfs_fuid_info_alloc(void); extern void zfs_fuid_info_free(); extern boolean_t zfs_groupmember(zfsvfs_t *, uint64_t, cred_t *); #endif /* !HAVE_SPL */ +#endif /* _KERNEL */ char *zfs_fuid_idx_domain(avl_tree_t *, uint32_t); uint64_t zfs_fuid_table_load(objset_t *, uint64_t, avl_tree_t *, avl_tree_t *); @@ -122,6 +123,5 @@ void zfs_fuid_table_destroy(avl_tree_t *, avl_tree_t *); #ifdef __cplusplus } #endif -#endif #endif /* _SYS_FS_ZFS_FUID_H */ From fdd6fa07278ebcac609c848a166cab5692dd82bf Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 22 Dec 2008 11:02:23 -0800 Subject: [PATCH 3/4] We don't need to #undef verify here, this is handled better now with the verify cleanup --- cmd/zdb/zdb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c index 253a1346a4..5f370e630d 100644 --- a/cmd/zdb/zdb.c +++ b/cmd/zdb/zdb.c @@ -52,7 +52,6 @@ #include #include #undef ZFS_MAXNAMELEN -#undef verify #include const char cmdname[] = "zdb"; From feb8aecd4783ff61c9e6f6060331a42418ac73a0 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 22 Dec 2008 11:05:41 -0800 Subject: [PATCH 4/4] Fix prototype --- cmd/zdb/zdb_il.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/zdb/zdb_il.c b/cmd/zdb/zdb_il.c index 02d35a0503..9341e81c3d 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;