Message ID | 159770519011.3958786.9102828204613614956.stgit@magnolia (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | xfsprogs: widen timestamps to deal with y2038 | expand |
On Tue, Aug 18, 2020 at 2:23 AM Darrick J. Wong <darrick.wong@oracle.com> wrote: > > From: Darrick J. Wong <darrick.wong@oracle.com> > > Clean up all the open-coded and duplicate definitions of time unit > conversion factors. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Amir Goldstein <amir73il@gmail.com>
diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in index 1f7ceafb1fbc..a11b58719380 100644 --- a/include/platform_defs.h.in +++ b/include/platform_defs.h.in @@ -80,4 +80,7 @@ typedef unsigned short umode_t; extern int platform_nproc(void); +#define NSEC_PER_SEC (1000000000ULL) +#define NSEC_PER_USEC (1000ULL) + #endif /* __XFS_PLATFORM_DEFS_H__ */ diff --git a/repair/dinode.c b/repair/dinode.c index c5f2248b2b9a..0bee3c3d988e 100644 --- a/repair/dinode.c +++ b/repair/dinode.c @@ -2172,7 +2172,7 @@ check_nsec( union xfs_timestamp *t, int *dirty) { - if (be32_to_cpu(t->t_nsec) < 1000000000) + if (be32_to_cpu(t->t_nsec) < NSEC_PER_SEC) return; do_warn( diff --git a/scrub/common.c b/scrub/common.c index 261f575a0c9b..70efaf04c648 100644 --- a/scrub/common.c +++ b/scrub/common.c @@ -294,8 +294,6 @@ scrub_nproc_workqueue( * Sleep for 100us * however many -b we got past the initial one. * This is an (albeit clumsy) way to throttle scrub activity. */ -#define NSEC_PER_SEC 1000000000ULL -#define NSEC_PER_USEC 1000ULL void background_sleep(void) { diff --git a/scrub/progress.c b/scrub/progress.c index d8130ca5f93c..15247b7c6d1b 100644 --- a/scrub/progress.c +++ b/scrub/progress.c @@ -110,7 +110,6 @@ progress_report( fflush(pt.fp); } -#define NSEC_PER_SEC (1000000000) static void * progress_report_thread(void *arg) {