Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
This commit is contained in:
commit
220644fcb3
|
@ -1663,7 +1663,7 @@ dump_uberblock(uberblock_t *ub, const char *header, const char *footer)
|
||||||
{
|
{
|
||||||
time_t timestamp = ub->ub_timestamp;
|
time_t timestamp = ub->ub_timestamp;
|
||||||
|
|
||||||
(void) printf(header ? header : "");
|
(void) printf("%s", header ? header : "");
|
||||||
(void) printf("\tmagic = %016llx\n", (u_longlong_t)ub->ub_magic);
|
(void) printf("\tmagic = %016llx\n", (u_longlong_t)ub->ub_magic);
|
||||||
(void) printf("\tversion = %llu\n", (u_longlong_t)ub->ub_version);
|
(void) printf("\tversion = %llu\n", (u_longlong_t)ub->ub_version);
|
||||||
(void) printf("\ttxg = %llu\n", (u_longlong_t)ub->ub_txg);
|
(void) printf("\ttxg = %llu\n", (u_longlong_t)ub->ub_txg);
|
||||||
|
@ -1675,7 +1675,7 @@ dump_uberblock(uberblock_t *ub, const char *header, const char *footer)
|
||||||
sprintf_blkptr(blkbuf, &ub->ub_rootbp);
|
sprintf_blkptr(blkbuf, &ub->ub_rootbp);
|
||||||
(void) printf("\trootbp = %s\n", blkbuf);
|
(void) printf("\trootbp = %s\n", blkbuf);
|
||||||
}
|
}
|
||||||
(void) printf(footer ? footer : "");
|
(void) printf("%s", footer ? footer : "");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in New Issue