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

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

This commit is contained in:
Brian Behlendorf 2010-07-12 10:25:47 -07:00
parent 995c4e789d e0d590aaf6
commit 6a586f9549
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/zdb/zdb.c
View File

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

14
module/zfs/zfs_fm.c
View File

@ -420,7 +420,7 @@ update_histogram(uint64_t value_arg, uint16_t *hist, uint32_t *count)
* to the new smallest gap, to prepare for our next invocation. * to the new smallest gap, to prepare for our next invocation.
*/ */
static void static void
shrink_ranges(zfs_ecksum_info_t *eip) zei_shrink_ranges(zfs_ecksum_info_t *eip)
{ {
uint32_t mingap = UINT32_MAX; uint32_t mingap = UINT32_MAX;
uint32_t new_allowed_gap = eip->zei_mingap + 1; uint32_t new_allowed_gap = eip->zei_mingap + 1;
@ -465,13 +465,13 @@ shrink_ranges(zfs_ecksum_info_t *eip)
} }
static void static void
add_range(zfs_ecksum_info_t *eip, int start, int end) zei_add_range(zfs_ecksum_info_t *eip, int start, int end)
{ {
struct zei_ranges *r = eip->zei_ranges; struct zei_ranges *r = eip->zei_ranges;
size_t count = eip->zei_range_count; size_t count = eip->zei_range_count;
if (count >= MAX_RANGES) { if (count >= MAX_RANGES) {
shrink_ranges(eip); zei_shrink_ranges(eip);
count = eip->zei_range_count; count = eip->zei_range_count;
} }
if (count == 0) { if (count == 0) {
@ -493,7 +493,7 @@ add_range(zfs_ecksum_info_t *eip, int start, int end)
} }
static size_t static size_t
range_total_size(zfs_ecksum_info_t *eip) zei_range_total_size(zfs_ecksum_info_t *eip)
{ {
struct zei_ranges *r = eip->zei_ranges; struct zei_ranges *r = eip->zei_ranges;
size_t count = eip->zei_range_count; size_t count = eip->zei_range_count;
@ -570,7 +570,7 @@ annotate_ecksum(nvlist_t *ereport, zio_bad_cksum_t *info,
if (start == -1) if (start == -1)
continue; continue;
add_range(eip, start, idx); zei_add_range(eip, start, idx);
start = -1; start = -1;
} else { } else {
if (start != -1) if (start != -1)
@ -580,10 +580,10 @@ annotate_ecksum(nvlist_t *ereport, zio_bad_cksum_t *info,
} }
} }
if (start != -1) if (start != -1)
add_range(eip, start, idx); zei_add_range(eip, start, idx);
/* See if it will fit in our inline buffers */ /* See if it will fit in our inline buffers */
inline_size = range_total_size(eip); inline_size = zei_range_total_size(eip);
if (inline_size > ZFM_MAX_INLINE) if (inline_size > ZFM_MAX_INLINE)
no_inline = 1; no_inline = 1;

2
module/zpios/zpios.c
View File

@ -1042,7 +1042,7 @@ zpios_ioctl_cmd(struct file *file, unsigned long arg)
kcmd = kmem_alloc(sizeof(zpios_cmd_t), KM_SLEEP); kcmd = kmem_alloc(sizeof(zpios_cmd_t), KM_SLEEP);
if (kcmd == NULL) { if (kcmd == NULL) {
zpios_print(file, "Unable to kmem_alloc() %ld byte for " zpios_print(file, "Unable to kmem_alloc() %ld byte for "
"zpios_cmd_t\n", sizeof(zpios_cmd_t)); "zpios_cmd_t\n", (long int)sizeof(zpios_cmd_t));
return -ENOMEM; return -ENOMEM;
} }