Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent

This commit is contained in:
Brian Behlendorf 2009-03-12 15:45:30 -07:00
commit 03c9f2a07b
3 changed files with 3 additions and 3 deletions

View File

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

View File

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

View File

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