From owner-svn-src-all@FreeBSD.ORG  Mon Jan 25 07:52:54 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BFB2F106568D;
	Mon, 25 Jan 2010 07:52:54 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AE9A48FC08;
	Mon, 25 Jan 2010 07:52:54 +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 o0P7qseL093959;
	Mon, 25 Jan 2010 07:52:54 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0P7qsFo093957;
	Mon, 25 Jan 2010 07:52:54 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201001250752.o0P7qsFo093957@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 25 Jan 2010 07:52:54 +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: r202964 - head/sys/cddl/compat/opensolaris/sys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jan 2010 07:52:54 -0000

Author: delphij
Date: Mon Jan 25 07:52:54 2010
New Revision: 202964
URL: http://svn.freebsd.org/changeset/base/202964

Log:
  On FreeBSD, time_t is 64-bit for all platforms except i386 and powerpc,
  where the type is 32-bit.  ZFS can handle 64-bit timestamp internally
  but zfs_setattr() would check if the time value can fit, we change the
  checking macros to match 64-bit timestamp if the platform supports it.
  
  This change has some downsides like, while you can import zfs on 32-bit
  platforms, the timestamp would overflow if they are out of the range.
  
  This fixes the Y2.038K issue on platforms using 64-bit timestamps.
  
  Reviewed by:	pjd
  MFC after:	1 month

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

Modified: head/sys/cddl/compat/opensolaris/sys/time.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/time.h	Mon Jan 25 07:37:37 2010	(r202963)
+++ head/sys/cddl/compat/opensolaris/sys/time.h	Mon Jan 25 07:52:54 2010	(r202964)
@@ -40,8 +40,13 @@ typedef longlong_t	hrtime_t;
 
 #define	LBOLT	((gethrtime() * hz) / NANOSEC)
 
+#if defined(__i386__) || defined(__powerpc__)
 #define	TIMESPEC_OVERFLOW(ts)						\
 	((ts)->tv_sec < INT32_MIN || (ts)->tv_sec > INT32_MAX)
+#else
+#define	TIMESPEC_OVERFLOW(ts)						\
+	((ts)->tv_sec < INT64_MIN || (ts)->tv_sec > INT64_MAX)
+#endif
 
 #ifdef _KERNEL
 #define	lbolt64	(int64_t)(LBOLT)