From e821063f33fcae90fc6ed559f0be5c182f5c9229 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 20 Sep 2015 11:33:46 +0200 Subject: [PATCH 217/257] ZFS ARC: Add a missing & to get a logical and instead of a binary one Obtained from: ElectroBSD --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c index 5bcc2cec49e3..6e89c7d3b6a5 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c @@ -1364,7 +1364,7 @@ dmu_tx_assign(dmu_tx_t *tx, txg_how_t txg_how) * because the user may set zfs_dirty_data_max himself and we must * must honor that as a hard cap so it remains a usable tunable value. */ - if (zio_use_uma & zfs_dynamic_write_buffer) { + if (zio_use_uma && zfs_dynamic_write_buffer) { zfs_dirty_data_max_internal = 1 << 28; zfs_dirty_data_max_internal = MAX(zfs_dirty_data_max_internal, ptob(vm_cnt.v_free_count - vm_cnt.v_free_target)); zfs_dirty_data_max_internal = MIN(zfs_dirty_data_max_internal, zfs_dirty_data_max); -- 2.11.0