Date: Thu, 29 Jan 2015 16:19:06 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r277881 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <201501291619.t0TGJ6gd001949@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501291619.t0TGJ6gd001949>