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

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

This commit is contained in:
Brian Behlendorf 2008-12-22 11:31:01 -08:00
parent 8d8dadfdea 5778b308a3
commit 3e9967f68e
3 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zdb/Makefile.am
View File

@ -24,4 +24,4 @@ zdb_LDADD = \
$(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la $(top_builddir)/lib/libzfs/libzfs.la
zdb_LDFLAGS = zdb_LDFLAGS = -pthread -lm -lz -lrt

42
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); (u_longlong_t)lr->lr_foid, (u_longlong_t)lr->lr_aclcnt);
} }
typedef void (*zil_prt_rec_func_t)(zilog_t *, int, lr_t *); typedef void (*zil_prt_rec_func_t)(zilog_t *, int, void *);
typedef struct zil_rec_info { typedef struct zil_rec_info {
zil_prt_rec_func_t zri_print; zil_prt_rec_func_t zri_print;
char *zri_name; char *zri_name;
@ -233,26 +233,26 @@ typedef struct zil_rec_info {
} zil_rec_info_t; } zil_rec_info_t;
static zil_rec_info_t zil_rec_info[TX_MAX_TYPE] = { static zil_rec_info_t zil_rec_info[TX_MAX_TYPE] = {
{ NULL, "Total " }, { NULL, "Total " },
{ zil_prt_rec_create, "TX_CREATE " }, { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_CREATE " },
{ zil_prt_rec_create, "TX_MKDIR " }, { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_MKDIR " },
{ zil_prt_rec_create, "TX_MKXATTR " }, { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_MKXATTR " },
{ zil_prt_rec_create, "TX_SYMLINK " }, { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_SYMLINK " },
{ zil_prt_rec_remove, "TX_REMOVE " }, { (zil_prt_rec_func_t)zil_prt_rec_remove, "TX_REMOVE " },
{ zil_prt_rec_remove, "TX_RMDIR " }, { (zil_prt_rec_func_t)zil_prt_rec_remove, "TX_RMDIR " },
{ zil_prt_rec_link, "TX_LINK " }, { (zil_prt_rec_func_t)zil_prt_rec_link, "TX_LINK " },
{ zil_prt_rec_rename, "TX_RENAME " }, { (zil_prt_rec_func_t)zil_prt_rec_rename, "TX_RENAME " },
{ zil_prt_rec_write, "TX_WRITE " }, { (zil_prt_rec_func_t)zil_prt_rec_write, "TX_WRITE " },
{ zil_prt_rec_truncate, "TX_TRUNCATE " }, { (zil_prt_rec_func_t)zil_prt_rec_truncate, "TX_TRUNCATE " },
{ zil_prt_rec_setattr, "TX_SETATTR " }, { (zil_prt_rec_func_t)zil_prt_rec_setattr, "TX_SETATTR " },
{ zil_prt_rec_acl, "TX_ACL_V0 " }, { (zil_prt_rec_func_t)zil_prt_rec_acl, "TX_ACL_V0 " },
{ zil_prt_rec_acl, "TX_ACL_ACL " }, { (zil_prt_rec_func_t)zil_prt_rec_acl, "TX_ACL_ACL " },
{ zil_prt_rec_create, "TX_CREATE_ACL " }, { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_CREATE_ACL " },
{ zil_prt_rec_create, "TX_CREATE_ATTR " }, { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_CREATE_ATTR " },
{ zil_prt_rec_create, "TX_CREATE_ACL_ATTR " }, { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_CREATE_ACL_ATTR " },
{ zil_prt_rec_create, "TX_MKDIR_ACL " }, { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_MKDIR_ACL " },
{ zil_prt_rec_create, "TX_MKDIR_ATTR " }, { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_MKDIR_ATTR " },
{ zil_prt_rec_create, "TX_MKDIR_ACL_ATTR " }, { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_MKDIR_ACL_ATTR " },
}; };
/* ARGSUSED */ /* ARGSUSED */

17
cmd/zinject/Makefile.am
View File

@ -1,7 +1,13 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/lib/libuutil/include \
-I${top_srcdir}/lib/libzfs/include \
-I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include
sbin_PROGRAMS = zinject sbin_PROGRAMS = zinject
@ -11,4 +17,11 @@ zinject_SOURCES = \
${top_srcdir}/cmd/zinject/zinject.h ${top_srcdir}/cmd/zinject/zinject.h
zinject_LDADD = \ zinject_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
zinject_LDFLAGS = -pthread -lm -lz -lrt