mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2025-10-26 18:05:04 +03:00
6413c95fbd
Commit torvalds/linux@95582b0 changes the inode i_atime, i_mtime, and i_ctime members form timespec's to timespec64's to make them 2038 safe. As part of this change the current_time() function was also updated to return the timespec64 type. Resolve this issue by introducing a new inode_timespec_t type which is defined to match the timespec type used by the inode. It should be used when working with inode timestamps to ensure matching types. The timestruc_t type under Illumos was used in a similar fashion but was specified to always be a timespec_t. Rather than incorrectly define this type all timespec_t types have been replaced by the new inode_timespec_t type. Finally, the kernel and user space 'sys/time.h' headers were aligned with each other. They define as appropriate for the context several constants as macros and include static inline implementation of gethrestime(), gethrestime_sec(), and gethrtime(). Reviewed-by: Chunwei Chen <tuxoko@gmail.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #7643
108 lines
2.3 KiB
C
108 lines
2.3 KiB
C
/*
|
|
* CDDL HEADER START
|
|
*
|
|
* The contents of this file are subject to the terms of the
|
|
* Common Development and Distribution License, Version 1.0 only
|
|
* (the "License"). You may not use this file except in compliance
|
|
* with the License.
|
|
*
|
|
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
|
* or http://www.opensolaris.org/os/licensing.
|
|
* See the License for the specific language governing permissions
|
|
* and limitations under the License.
|
|
*
|
|
* When distributing Covered Code, include this CDDL HEADER in each
|
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
* If applicable, add the following below this CDDL HEADER, with the
|
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
|
*
|
|
* CDDL HEADER END
|
|
*/
|
|
/*
|
|
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
|
|
* Use is subject to license terms.
|
|
*/
|
|
|
|
#ifndef _LIBSPL_SYS_TIME_H
|
|
#define _LIBSPL_SYS_TIME_H
|
|
|
|
#include <time.h>
|
|
#include <sys/types.h>
|
|
#include_next <sys/time.h>
|
|
|
|
#ifndef SEC
|
|
#define SEC 1
|
|
#endif
|
|
|
|
#ifndef MILLISEC
|
|
#define MILLISEC 1000
|
|
#endif
|
|
|
|
#ifndef MICROSEC
|
|
#define MICROSEC 1000000
|
|
#endif
|
|
|
|
#ifndef NANOSEC
|
|
#define NANOSEC 1000000000
|
|
#endif
|
|
|
|
#ifndef NSEC_PER_USEC
|
|
#define NSEC_PER_USEC 1000L
|
|
#endif
|
|
|
|
#ifndef MSEC2NSEC
|
|
#define MSEC2NSEC(m) ((hrtime_t)(m) * (NANOSEC / MILLISEC))
|
|
#endif
|
|
|
|
#ifndef NSEC2MSEC
|
|
#define NSEC2MSEC(n) ((n) / (NANOSEC / MILLISEC))
|
|
#endif
|
|
|
|
#ifndef USEC2NSEC
|
|
#define USEC2NSEC(m) ((hrtime_t)(m) * (NANOSEC / MICROSEC))
|
|
#endif
|
|
|
|
#ifndef NSEC2USEC
|
|
#define NSEC2USEC(n) ((n) / (NANOSEC / MICROSEC))
|
|
#endif
|
|
|
|
#ifndef NSEC2SEC
|
|
#define NSEC2SEC(n) ((n) / (NANOSEC / SEC))
|
|
#endif
|
|
|
|
#ifndef SEC2NSEC
|
|
#define SEC2NSEC(m) ((hrtime_t)(m) * (NANOSEC / SEC))
|
|
#endif
|
|
|
|
typedef long long hrtime_t;
|
|
typedef struct timespec timespec_t;
|
|
typedef struct timespec inode_timespec_t;
|
|
|
|
static inline void
|
|
gethrestime(inode_timespec_t *ts)
|
|
{
|
|
struct timeval tv;
|
|
(void) gettimeofday(&tv, NULL);
|
|
ts->tv_sec = tv.tv_sec;
|
|
ts->tv_nsec = tv.tv_usec * NSEC_PER_USEC;
|
|
}
|
|
|
|
static inline time_t
|
|
gethrestime_sec(void)
|
|
{
|
|
struct timeval tv;
|
|
(void) gettimeofday(&tv, NULL);
|
|
return (tv.tv_sec);
|
|
}
|
|
|
|
static inline hrtime_t
|
|
gethrtime(void)
|
|
{
|
|
struct timespec ts;
|
|
(void) clock_gettime(CLOCK_MONOTONIC, &ts);
|
|
return ((((u_int64_t)ts.tv_sec) * NANOSEC) + ts.tv_nsec);
|
|
}
|
|
|
|
#endif /* _LIBSPL_SYS_TIME_H */
|