LU-1346 libcfs: cleanup libcfs primitive (linux-prim.h)

[fs/lustre-release.git] / libcfs / libcfs / linux / linux-prim.c

diff --git a/libcfs/libcfs/linux/linux-prim.c b/libcfs/libcfs/linux/linux-prim.c
index b6719d1..2f1eec1 100644 (file)
--- a/libcfs/libcfs/linux/linux-prim.c
+++ b/libcfs/libcfs/linux/linux-prim.c
@@ -46,47 +46,47 @@
 #include <asm/kgdb.h>
 #endif
 
-void cfs_init_timer(cfs_timer_t *t)
+void cfs_init_timer(struct timer_list *t)
 {
-        init_timer(t);
+       init_timer(t);
 }
 EXPORT_SYMBOL(cfs_init_timer);
 
-void cfs_timer_init(cfs_timer_t *t, cfs_timer_func_t *func, void *arg)
+void cfs_timer_init(struct timer_list *t, cfs_timer_func_t *func, void *arg)
 {
-        init_timer(t);
-        t->function = func;
-        t->data = (unsigned long)arg;
+       init_timer(t);
+       t->function = func;
+       t->data = (unsigned long)arg;
 }
 EXPORT_SYMBOL(cfs_timer_init);
 
-void cfs_timer_done(cfs_timer_t *t)
+void cfs_timer_done(struct timer_list *t)
 {
-        return;
+       return;
 }
 EXPORT_SYMBOL(cfs_timer_done);
 
-void cfs_timer_arm(cfs_timer_t *t, cfs_time_t deadline)
+void cfs_timer_arm(struct timer_list *t, cfs_time_t deadline)
 {
-        mod_timer(t, deadline);
+       mod_timer(t, deadline);
 }
 EXPORT_SYMBOL(cfs_timer_arm);
 
-void cfs_timer_disarm(cfs_timer_t *t)
+void cfs_timer_disarm(struct timer_list *t)
 {
-        del_timer(t);
+       del_timer(t);
 }
 EXPORT_SYMBOL(cfs_timer_disarm);
 
-int  cfs_timer_is_armed(cfs_timer_t *t)
+int  cfs_timer_is_armed(struct timer_list *t)
 {
-        return timer_pending(t);
+       return timer_pending(t);
 }
 EXPORT_SYMBOL(cfs_timer_is_armed);
 
-cfs_time_t cfs_timer_deadline(cfs_timer_t *t)
+cfs_time_t cfs_timer_deadline(struct timer_list *t)
 {
-        return t->expires;
+       return t->expires;
 }
 EXPORT_SYMBOL(cfs_timer_deadline);
 
@@ -141,7 +141,7 @@ sigset_t cfs_block_sigsinv(unsigned long sigs)
 }
 
 void
-cfs_restore_sigs (cfs_sigset_t old)
+cfs_restore_sigs(sigset_t old)
 {
        unsigned long  flags;