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

Merge commit 'refs/top-bases/linux-libspl' into linux-libspl

This commit is contained in:
Brian Behlendorf 2009-03-12 15:47:07 -07:00
parent 574ed0e0b7 82ce8b00f3
commit 640eb1d542
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zdb/zdb.c
View File

@ -1882,7 +1882,7 @@ zdb_dump_block_raw(void *buf, uint64_t size, int flags)
{ {
if (flags & ZDB_FLAG_BSWAP) if (flags & ZDB_FLAG_BSWAP)
byteswap_uint64_array(buf, size); byteswap_uint64_array(buf, size);
(void) write(2, buf, size); VERIFY(write(fileno(stderr), buf, size) == size);
} }
static void static void

2
cmd/ztest/ztest.c
View File

@ -1171,7 +1171,7 @@ ztest_vdev_LUN_growth(ztest_args_t *za)
*/ */
if (fsize < 2 * zopt_vdev_size) { if (fsize < 2 * zopt_vdev_size) {
size_t newsize = fsize + ztest_random(fsize / 32); size_t newsize = fsize + ztest_random(fsize / 32);
(void) ftruncate(fd, newsize); VERIFY(ftruncate(fd, newsize) == 0);
if (zopt_verbose >= 6) { if (zopt_verbose >= 6) {
(void) printf("%s grew from %lu to %lu bytes\n", (void) printf("%s grew from %lu to %lu bytes\n",
dev_name, (ulong_t)fsize, (ulong_t)newsize); dev_name, (ulong_t)fsize, (ulong_t)newsize);

2
lib/libzpool/kernel.c
View File

@ -829,7 +829,7 @@ umem_out_of_memory(void)
{ {
char errmsg[] = "out of memory -- generating core dump\n"; char errmsg[] = "out of memory -- generating core dump\n";
write(fileno(stderr), errmsg, sizeof (errmsg)); (void) fprintf(stderr, "%s", errmsg);
abort(); abort();
return (0); return (0);
} }