diff options
| author | delphij <delphij@FreeBSD.org> | 2014-07-15 05:36:26 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-07-15 05:36:26 +0000 |
| commit | 4d09e20b956fcbbcb5d1311c44c4e1cee4c3b0e4 (patch) | |
| tree | 06c882f7c58191d7c93d7600afb79aaec614f3d8 /cddl/contrib | |
| parent | f8b96a7c88fb1506692a5290c444d1494309d443 (diff) | |
| download | FreeBSD-src-4d09e20b956fcbbcb5d1311c44c4e1cee4c3b0e4.zip FreeBSD-src-4d09e20b956fcbbcb5d1311c44c4e1cee4c3b0e4.tar.gz | |
MFC r268086: MFV r267570:
4756 metaslab_group_preload() could deadlock
Diffstat (limited to 'cddl/contrib')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/ztest/ztest.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/cmd/ztest/ztest.c b/cddl/contrib/opensolaris/cmd/ztest/ztest.c index c0ece98..8f5d7ce 100644 --- a/cddl/contrib/opensolaris/cmd/ztest/ztest.c +++ b/cddl/contrib/opensolaris/cmd/ztest/ztest.c @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. @@ -187,6 +187,7 @@ static const ztest_shared_opts_t ztest_opts_defaults = { extern uint64_t metaslab_gang_bang; extern uint64_t metaslab_df_alloc_threshold; extern uint64_t zfs_deadman_synctime_ms; +extern int metaslab_preload_limit; static ztest_shared_opts_t *ztest_shared_opts; static ztest_shared_opts_t ztest_opts; @@ -5596,6 +5597,7 @@ ztest_run(ztest_shared_t *zs) kernel_init(FREAD | FWRITE); VERIFY0(spa_open(ztest_opts.zo_pool, &spa, FTAG)); spa->spa_debug = B_TRUE; + metaslab_preload_limit = ztest_random(20) + 1; ztest_spa = spa; VERIFY0(dmu_objset_own(ztest_opts.zo_pool, |
