Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent

This commit is contained in:
Brian Behlendorf 2008-12-22 11:08:17 -08:00
parent 6a981c09a5 13decb5b30
commit 22f583b0f5
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/zdb/Makefile.am
View File

@ -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 =

1
cmd/zdb/zdb.c
View File

@ -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";

2
cmd/zdb/zdb_il.c
View File

@ -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;

2
module/zfs/include/sys/zfs_fuid.h
View File

@ -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 */