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

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

This commit is contained in:
Brian Behlendorf 2010-06-29 13:43:32 -07:00
parent 54a400c66d f25df40f84
commit 72663d2d39
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/ztest/Makefile.in
View File

@ -288,7 +288,8 @@ AM_LIBTOOLFLAGS = --silent
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" \
-Wframe-larger-than=1024
ztest_SOURCES = \ ztest_SOURCES = \
${top_srcdir}/cmd/ztest/ztest.c ${top_srcdir}/cmd/ztest/ztest.c

16
cmd/ztest/ztest.c
View File

@ -4822,11 +4822,15 @@ static void
ztest_run_zdb(char *pool) ztest_run_zdb(char *pool)
{ {
int status; int status;
char bin[MAXPATHLEN + MAXNAMELEN + 20]; char *bin;
char zdb[MAXPATHLEN + MAXNAMELEN + 20]; char *zdb;
char zbuf[1024]; char *zbuf;
FILE *fp; FILE *fp;
bin = umem_alloc(MAXPATHLEN + MAXNAMELEN + 20, UMEM_NOFAIL);
zdb = umem_alloc(MAXPATHLEN + MAXNAMELEN + 20, UMEM_NOFAIL);
zbuf = umem_alloc(1024, UMEM_NOFAIL);
/* Designed to be run exclusively in the development tree */ /* Designed to be run exclusively in the development tree */
VERIFY(realpath(getexecname(), bin) != NULL); VERIFY(realpath(getexecname(), bin) != NULL);
strstr(bin, "/ztest/")[0] = '\0'; strstr(bin, "/ztest/")[0] = '\0';
@ -4850,13 +4854,17 @@ ztest_run_zdb(char *pool)
status = pclose(fp); status = pclose(fp);
if (status == 0) if (status == 0)
return; goto out;
ztest_dump_core = 0; ztest_dump_core = 0;
if (WIFEXITED(status)) if (WIFEXITED(status))
fatal(0, "'%s' exit code %d", zdb, WEXITSTATUS(status)); fatal(0, "'%s' exit code %d", zdb, WEXITSTATUS(status));
else else
fatal(0, "'%s' died with signal %d", zdb, WTERMSIG(status)); fatal(0, "'%s' died with signal %d", zdb, WTERMSIG(status));
out:
umem_free(bin, MAXPATHLEN + MAXNAMELEN + 20);
umem_free(zdb, MAXPATHLEN + MAXNAMELEN + 20);
umem_free(zbuf, 1024);
} }
static void static void

2
configure vendored
View File

@ -17281,7 +17281,7 @@ _ACEOF
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG " KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG "
HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG " HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG "
USERDEBUG="-DDEBUG" USERDEBUG="-DDEBUG -fstack-check"
else else
{ $as_echo "$as_me:$LINENO: result: no" >&5 { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }

3
lib/libzpool/Makefile.in
View File

@ -348,7 +348,8 @@ AM_LIBTOOLFLAGS = --silent
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" \
-Wframe-larger-than=1024
SUBDIRS = include SUBDIRS = include
lib_LTLIBRARIES = libzpool.la lib_LTLIBRARIES = libzpool.la
libzpool_la_SOURCES = \ libzpool_la_SOURCES = \