Mercurial > illumos > illumos-gate
diff usr/src/uts/common/fs/zfs/dsl_dataset.c @ 12587:16aef3d16470
6957090 ddt_zap_prefetch() induces deadlock, panic
6958874 bpobj_close() tries to dereference a NULL bpo_dbuf
| author | George Wilson <George.Wilson@Sun.COM> |
|---|---|
| date | Tue, 08 Jun 2010 13:36:53 -0700 |
| parents | 693dd2cad55f |
| children | 06a71df33c1c |
line wrap: on
line diff
--- a/usr/src/uts/common/fs/zfs/dsl_dataset.c Tue Jun 08 12:32:02 2010 -0700 +++ b/usr/src/uts/common/fs/zfs/dsl_dataset.c Tue Jun 08 13:36:53 2010 -0700 @@ -42,11 +42,6 @@ #include <sys/dsl_scan.h> #include <sys/dsl_deadlist.h> -/* - * Enable/disable prefetching of dedup-ed blocks which are going to be freed. - */ -int zfs_dedup_prefetch = 1; - static char *dsl_reaper = "the grim reaper"; static dsl_checkfunc_t dsl_dataset_destroy_begin_check; @@ -254,8 +249,7 @@ if (blk_birth <= dsl_dataset_prev_snap_txg(ds)) return (B_FALSE); - if (zfs_dedup_prefetch && bp && BP_GET_DEDUP(bp)) - ddt_prefetch(dsl_dataset_get_spa(ds), bp); + ddt_prefetch(dsl_dataset_get_spa(ds), bp); return (B_TRUE); }