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

Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 

Conflicts:
	cmd/zdb/zdb_il.c
This commit is contained in:
Brian Behlendorf 2010-05-28 15:38:05 -07:00
parent 0df35b3599 2591cac812
commit d8f9623833
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zdb/zdb_il.c
View File

@ -248,7 +248,7 @@ 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_func_t)zil_prt_rec_create, "TX_CREATE " }, { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_CREATE " },
{ (zil_prt_rec_func_t)zil_prt_rec_create, "TX_MKDIR " }, { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_MKDIR " },
{ (zil_prt_rec_func_t)zil_prt_rec_create, "TX_MKXATTR " }, { (zil_prt_rec_func_t)zil_prt_rec_create, "TX_MKXATTR " },