From owner-svn-src-head@FreeBSD.ORG  Tue Feb  1 14:28:51 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1DC8A106564A;
	Tue,  1 Feb 2011 14:28:51 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0C6768FC08;
	Tue,  1 Feb 2011 14:28:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p11ESoTQ074788;
	Tue, 1 Feb 2011 14:28:50 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p11ESoQw074786;
	Tue, 1 Feb 2011 14:28:50 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201102011428.p11ESoQw074786@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Tue, 1 Feb 2011 14:28:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218169 - head/sys/cddl/compat/opensolaris/sys
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Feb 2011 14:28:51 -0000

Author: mm
Date: Tue Feb  1 14:28:50 2011
New Revision: 218169
URL: http://svn.freebsd.org/changeset/base/218169

Log:
  For ZFS, change the type of clock_t to int64_t.
  
  The clock_t type in OpenSolaris is long (int64_t on amd64).
  On FreeBSD clock_t is int32_t. The clock_t type is used in several places
  in the ZFS code to store system uptime in milliseconds ("seconds * hz").
  
  With hz=1000 we have a 32-bit integer overflow in 24 days, 20 hours,
  31 minutes and 23.648 seconds. This has a user reported negative impact
  on l2arc_feed_thread() and may cause unexpected results from other functions
  using clock_t.
  
  Reported by:	Artem Belevich <fbsdlist@src.cx> on freebsd-fs@
  MFC after:	1 week

Modified:
  head/sys/cddl/compat/opensolaris/sys/types.h

Modified: head/sys/cddl/compat/opensolaris/sys/types.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/types.h	Tue Feb  1 13:33:49 2011	(r218168)
+++ head/sys/cddl/compat/opensolaris/sys/types.h	Tue Feb  1 14:28:50 2011	(r218169)
@@ -34,6 +34,10 @@
  */
 
 #include <sys/stdint.h>
+
+typedef	int64_t		clock_t;
+#define	_CLOCK_T_DECLARED
+
 #include_next <sys/types.h>
 
 #define	MAXNAMELEN	256