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

Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-22 11:07:39 -08:00
parent 4bf318d0a8 b8245db563
commit feb8953178
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;