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

Merge commit 'refs/remotes/origin/linux-ztest' into HEAD

This commit is contained in:
Brian Behlendorf 2009-06-26 14:36:05 -07:00
parent 4fbded409d f4d3e57045
commit f4db5d25d1
3 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.topdeps
View File

@ -1,3 +1 @@
gcc-branch zfs-branch
fix-branch
feature-branch

17
.topmsg
View File

@ -1,19 +1,6 @@
From: Brian Behlendorf <behlendorf1@llnl.gov> From: Brian Behlendorf <behlendorf1@llnl.gov>
Subject: [PATCH] zfs branch Subject: [PATCH] linux ztest
Merged result of all changes which are relevant to both Solaris Minor changes to ztest for this environment.
and Linux builds of the ZFS code. These are changes where there
is a reasonable chance they will be accepted upstream.
Additionally, since this is effectively the root of the linux
ZFS tree the core linux build system is added here. This
includes autogen.sh, configure.ac, m4 macros, some scripts/*,
and makefiles for all the core ZFS components. Linux-only
features which require tweaks to the build system should appear
on the relevant topic branches. All autotools products which
result from autogen.sh are commited to the linux-configure-branch.
This branch also contains the META, ChangeLog, AUTHORS, TODO,
and README, files.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

24
cmd/ztest/ztest.c
View File

@ -2995,31 +2995,21 @@ static void
ztest_verify_blocks(char *pool) ztest_verify_blocks(char *pool)
{ {
int status; int status;
char bin[MAXPATHLEN + MAXNAMELEN + 20];
char zdb[MAXPATHLEN + MAXNAMELEN + 20]; char zdb[MAXPATHLEN + MAXNAMELEN + 20];
char zbuf[1024]; char zbuf[1024];
char *bin;
char *ztest;
char *isa;
int isalen;
FILE *fp; FILE *fp;
(void) realpath(getexecname(), zdb); /* Designed to be run exclusively in the development tree */
VERIFY(realpath(getexecname(), bin) != NULL);
strstr(bin, "/ztest/")[0] = '\0';
/* zdb lives in /usr/sbin, while ztest lives in /usr/bin */ (void) sprintf(zdb,
bin = strstr(zdb, "/usr/bin/"); "%s/zdb/zdb -bc%s%s -U /tmp/zpool.cache %s",
ztest = strstr(bin, "/ztest"); bin,
isa = bin + 8;
isalen = ztest - isa;
isa = strdup(isa);
/* LINTED */
(void) sprintf(bin,
"/usr/sbin%.*s/zdb -bc%s%s -U /tmp/zpool.cache %s",
isalen,
isa,
zopt_verbose >= 3 ? "s" : "", zopt_verbose >= 3 ? "s" : "",
zopt_verbose >= 4 ? "v" : "", zopt_verbose >= 4 ? "v" : "",
pool); pool);
free(isa);
if (zopt_verbose >= 5) if (zopt_verbose >= 5)
(void) printf("Executing %s\n", strstr(zdb, "zdb ")); (void) printf("Executing %s\n", strstr(zdb, "zdb "));