LU-9019 libcfs: remove no longer use time abstraction

With the cleanup from 64 bit time handling we can remove
several no longer used wrapper functions in libcfs. Also
add test to checkpatch to warn patch submitters to use
the proper linux kernel timer functions for functions
that will soon go away.

Test-Parameters: trivial

Change-Id: Ie23d74d1faea6589e7def5225321ddc52c7e65b7
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/27420
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Olaf Weber <olaf.weber@hpe.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/contrib/scripts/checkpatch.pl b/contrib/scripts/checkpatch.pl
index 893fa89..1923bd2 100755 (executable)
--- a/contrib/scripts/checkpatch.pl
+++ b/contrib/scripts/checkpatch.pl
@@ -432,6 +432,13 @@ my %dep_functions = (
        'cfs_list_splice_tail',         'list_splice_tail',
        'cfs_list_t',                   'struct list_head',
 
        'cfs_list_splice_tail',         'list_splice_tail',
        'cfs_list_t',                   'struct list_head',
 

+       'struct timeval',               'struct timespec64',
+       'cfs_time_current_sec',         'ktime_get_real_seconds',
+       'cfs_time_current_64',          'ktime_get',
+       'cfs_time_add_64',              'ktime_add',
+       'cfs_time_before_64',           'ktime_before',
+       'cfs_time_beforeq_64',          'ktime_compare',
+

        'CFS_PAGE_MASK',                'PAGE_MASK',
        'CFS_PAGE_SIZE',                'PAGE_SIZE',
        'PAGE_CACHE_MASK',              'PAGE_MASK',
        'CFS_PAGE_MASK',                'PAGE_MASK',
        'CFS_PAGE_SIZE',                'PAGE_SIZE',
        'PAGE_CACHE_MASK',              'PAGE_MASK',

diff --git a/libcfs/include/libcfs/libcfs_time.h b/libcfs/include/libcfs/libcfs_time.h
index 3b64c84..68947c9 100644 (file)
--- a/libcfs/include/libcfs/libcfs_time.h
+++ b/libcfs/include/libcfs/libcfs_time.h
@@ -60,42 +60,11 @@ static inline int cfs_time_aftereq(cfs_time_t t1, cfs_time_t t2)
         return cfs_time_beforeq(t2, t1);
 }
 
         return cfs_time_beforeq(t2, t1);
 }
 

-

 static inline cfs_time_t cfs_time_shift(int seconds)
 {
         return cfs_time_add(cfs_time_current(), cfs_time_seconds(seconds));
 }
 
 static inline cfs_time_t cfs_time_shift(int seconds)
 {
         return cfs_time_add(cfs_time_current(), cfs_time_seconds(seconds));
 }
 

-static inline long cfs_timeval_sub(struct timeval *large, struct timeval *small,
-                                   struct timeval *result)
-{
-        long r = (long) (
-                (large->tv_sec - small->tv_sec) * ONE_MILLION +
-                (large->tv_usec - small->tv_usec));
-        if (result != NULL) {
-                result->tv_usec = r % ONE_MILLION;
-                result->tv_sec = r / ONE_MILLION;
-        }
-        return r;
-}
-
-#define CFS_RATELIMIT(seconds)                                  \
-({                                                              \
-        /*                                                      \
-         * XXX nikita: non-portable initializer                 \
-         */                                                     \
-        static time_t __next_message = 0;                       \
-        int result;                                             \
-                                                                \
-        if (cfs_time_after(cfs_time_current(), __next_message)) \
-                result = 1;                                     \
-        else {                                                  \
-                __next_message = cfs_time_shift(seconds);       \
-                result = 0;                                     \
-        }                                                       \
-        result;                                                 \
-})
-

 #define CFS_TICK       1
 
 /*
 #define CFS_TICK       1
 
 /*

diff --git a/libcfs/include/libcfs/linux/linux-time.h b/libcfs/include/libcfs/linux/linux-time.h
index 18af8f6..a217929 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-time.h
+++ b/libcfs/include/libcfs/linux/linux-time.h
@@ -227,32 +227,14 @@ static inline time_t cfs_time_current_sec(void)
 
 static inline cfs_duration_t cfs_time_seconds(int seconds)
 {
 
 static inline cfs_duration_t cfs_time_seconds(int seconds)
 {

-

        return ((cfs_duration_t)seconds) * msecs_to_jiffies(MSEC_PER_SEC);
 }
 
 static inline time_t cfs_duration_sec(cfs_duration_t d)
 {
        return ((cfs_duration_t)seconds) * msecs_to_jiffies(MSEC_PER_SEC);
 }
 
 static inline time_t cfs_duration_sec(cfs_duration_t d)
 {

-

        return d / msecs_to_jiffies(MSEC_PER_SEC);
 }
 
        return d / msecs_to_jiffies(MSEC_PER_SEC);
 }
 

-static inline void cfs_duration_nsec(cfs_duration_t d, struct timespec *s)
-{
-#if (BITS_PER_LONG == 32)
-       __u64 t;
-
-       s->tv_sec = d / msecs_to_jiffies(MSEC_PER_SEC);
-       t = (d - s->tv_sec * msecs_to_jiffies(MSEC_PER_SEC)) * NSEC_PER_SEC;
-       do_div(t, msecs_to_jiffies(MSEC_PER_SEC));
-       s->tv_nsec = t;
-#else
-       s->tv_sec = d / msecs_to_jiffies(MSEC_PER_SEC);
-       s->tv_nsec = ((d - s->tv_sec * msecs_to_jiffies(MSEC_PER_SEC)) *
-                     NSEC_PER_SEC) / msecs_to_jiffies(MSEC_PER_SEC);
-#endif
-}
-

 #define cfs_time_current_64 get_jiffies_64
 
 static inline __u64 cfs_time_add_64(__u64 t, __u64 d)
 #define cfs_time_current_64 get_jiffies_64
 
 static inline __u64 cfs_time_add_64(__u64 t, __u64 d)


@@ -281,14 +263,4 @@ static inline int cfs_time_beforeq_64(__u64 t1, __u64 t2)
  */
 #define CFS_DURATION_T          "%ld"
 
  */
 #define CFS_DURATION_T          "%ld"
 

-

 #endif /* __LIBCFS_LINUX_LINUX_TIME_H__ */
 #endif /* __LIBCFS_LINUX_LINUX_TIME_H__ */

-/*
- * Local variables:
- * c-indentation-style: "K&R"
- * c-basic-offset: 8
- * tab-width: 8
- * fill-column: 80
- * scroll-step: 1
- * End:
- */