svn commit: r277185 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Wed Jan 14 16:22:00 2015
New Revision: 277185
URL: https://svnweb.freebsd.org/changeset/base/277185

Log:
  Fix overflow bug from r248577, turning 30s TRIM timeout into ~4s.
  
  MFC after:	2 weeks

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c	Wed Jan 14 15:45:18 2015	(r277184)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c	Wed Jan 14 16:22:00 2015	(r277185)
@@ -440,7 +440,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;