Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix RPM build and 32 bit build problems with current raidz expansion … #4

Merged
merged 1 commit into from
Jul 19, 2020
Merged

Fix RPM build and 32 bit build problems with current raidz expansion … #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions cmd/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
SUBDIRS = zfs zpool zdb zhack zinject zstream zstreamdump ztest
# BUGBUG raidz expansion no raidz_test for now
#SUBDIRS += fsck_zfs vdev_id raidz_test zfs_ids_to_path
SUBDIRS += fsck_zfs vdev_id zfs_ids_to_path
# BUGBUG raidz expansion end
SUBDIRS += fsck_zfs vdev_id raidz_test zfs_ids_to_path

if USING_PYTHON
SUBDIRS += arcstat arc_summary dbufstat
Expand Down
5 changes: 5 additions & 0 deletions cmd/raidz_test/raidz_bench.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@

#include <sys/time.h>

/*BUGBUG*/
/*raidz expansion - temporarily disabled */
#if 0
#include "raidz_test.h"

#define GEN_BENCH_MEMORY (((uint64_t)1ULL)<<32)
Expand Down Expand Up @@ -225,3 +228,5 @@ run_raidz_benchmark(void)

bench_fini_raidz_maps();
}
/*BUGBUG*/
#endif /* 0 - disabled for now */
14 changes: 14 additions & 0 deletions cmd/raidz_test/raidz_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
#include <sys/vdev_raidz_impl.h>
#include <assert.h>
#include <stdio.h>
/*BUGBUG*/
#if 0 /* disabled currently for raidz expansion */

#include "raidz_test.h"

static int *rand_data;
Expand Down Expand Up @@ -732,9 +735,18 @@ run_sweep(void)
return (sweep_state == SWEEP_ERROR ? SWEEP_ERROR : 0);
}

/*BUGBUG*/
#endif /*0 - raidz expansion, currently disabled */

int
main(int argc, char **argv)
{
/*BUGBUG*/
/* currently disabled for raidz expansion*/
int err = 0;
fprintf(stdout, "\nraidz_test temporarily disabled - raidz expansion\n");
exit(EXIT_FAILURE);
#if 0
size_t i;
struct sigaction action;
int err = 0;
Expand Down Expand Up @@ -777,6 +789,8 @@ main(int argc, char **argv)

umem_free(rand_data, SPA_MAXBLOCKSIZE);
kernel_fini();
/*BUGBUG*/
#endif /*0 - raidz expansion, currently disabled */

return (err);
}
2 changes: 1 addition & 1 deletion module/zfs/vdev_raidz.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3562,7 +3562,7 @@ vdev_raidz_load(vdev_t *vd)
if (vdrz->vn_vre.vre_offset != UINT64_MAX) {
ASSERT3U(vdrz->vn_vre.vre_vdev_id, ==, vd->vdev_id);
/* There can only be one expansion at a time. */
ASSERT0(vd->vdev_spa->spa_raidz_expand);
ASSERT3P(vd->vdev_spa->spa_raidz_expand, ==, NULL);

vd->vdev_spa->spa_raidz_expand = &vdrz->vn_vre;
}
Expand Down