summaryrefslogtreecommitdiffstats
path: root/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
diff options
context:
space:
mode:
authorsmh <smh@FreeBSD.org>2013-04-26 11:24:20 +0000
committersmh <smh@FreeBSD.org>2013-04-26 11:24:20 +0000
commit61d529d085e6782aaaceec7e1beed1de853df302 (patch)
treeb91bc447856df4fa95948b51ad1eae1f59eee791 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
parentd75579076edb2de14a29403af6030bf1c06dde35 (diff)
downloadFreeBSD-src-61d529d085e6782aaaceec7e1beed1de853df302.zip
FreeBSD-src-61d529d085e6782aaaceec7e1beed1de853df302.tar.gz
Changed ZFS TRIM sysctl from vfs.zfs.trim_disable -> vfs.zfs.trim.enabled
Enabled ZFS TRIM by default Reviewed by: pjd (mentor) Approved by: pjd (mentor) MFC after: 2 weeks
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
index c47f793..92ae0ed 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
@@ -729,7 +729,7 @@ vdev_label_init(vdev_t *vd, uint64_t crtxg, vdev_labeltype_t reason)
* Don't TRIM if removing so that we don't interfere with zpool
* disaster recovery.
*/
- if (!zfs_notrim && vdev_trim_on_init && (reason == VDEV_LABEL_CREATE ||
+ if (zfs_trim_enabled && vdev_trim_on_init && (reason == VDEV_LABEL_CREATE ||
reason == VDEV_LABEL_SPARE || reason == VDEV_LABEL_L2CACHE))
zio_wait(zio_trim(NULL, spa, vd, 0, vd->vdev_psize));
OpenPOWER on IntegriCloud