Author: mav
Date: Thu Jan 29 16:19:05 2015
New Revision: 277881
URL: https://svnweb.freebsd.org/changeset/base/277881
Log:
MFC r277185:
Fix overflow bug from r248577, turning 30s TRIM timeout into ~4s.
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
Directory Properties:
stable/9/ (props changed)
stable/9/sys/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c Thu Jan
29 16:16:20 2015 (r277880)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c Thu Jan
29 16:19:05 2015 (r277881)
@@ -463,7 +463,7 @@ trim_map_vdev_commit(spa_t *spa, zio_t *
if (tm == NULL)
return;
- timelimit = gethrtime() - trim_timeout * NANOSEC;
+ timelimit = gethrtime() - (hrtime_t)trim_timeout * NANOSEC;
if (vd->vdev_isl2cache) {
txgsafe = UINT64_MAX;
txgtarget = UINT64_MAX;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
