X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Flibcfs_time.h;h=21619bac8a507494ae725b338fc109d57ce55f66;hp=946c2be7d52006004432e7ecaa2b9c1e66ad8de3;hb=c3ddfae1b795385aa14db61df1a416ab57bfc066;hpb=c8616363809a73b3d4b6c736e6b55a84d7f137b4 diff --git a/libcfs/include/libcfs/libcfs_time.h b/libcfs/include/libcfs/libcfs_time.h index 946c2be..21619ba 100644 --- a/libcfs/include/libcfs/libcfs_time.h +++ b/libcfs/include/libcfs/libcfs_time.h @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,7 +24,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -41,6 +39,7 @@ #ifndef __LIBCFS_TIME_H__ #define __LIBCFS_TIME_H__ + /* * generic time manipulation functions. */ @@ -55,16 +54,6 @@ static inline cfs_duration_t cfs_time_sub(cfs_time_t t1, cfs_time_t t2) return (cfs_time_t)(t1 - t2); } -static inline int cfs_time_before(cfs_time_t t1, cfs_time_t t2) -{ - return time_before(t1, t2); -} - -static inline int cfs_time_beforeq(cfs_time_t t1, cfs_time_t t2) -{ - return time_before_eq(t1, t2); -} - static inline int cfs_time_after(cfs_time_t t1, cfs_time_t t2) { return cfs_time_before(t2, t1); @@ -120,17 +109,6 @@ static inline void cfs_slow_warning(cfs_time_t now, int seconds, char *msg) }) /* - * helper function similar to do_gettimeofday() of Linux kernel - */ -static inline void cfs_fs_timeval(struct timeval *tv) -{ - cfs_fs_time_t time; - - cfs_fs_time_current(&time); - cfs_fs_time_usec(&time, tv); -} - -/* * return valid time-out based on user supplied one. Currently we only check * that time-out is not shorted than allowed. */