[PATCH] btt: finalize the INLINE fixup

diff --git a/btt/inlines.h b/btt/inlines.h
index cda74b842810247b27172e6506f57f7c68164783..4b7f10e30090309483889a87f8ad402e01d44262 100644 (file)
--- a/btt/inlines.h
+++ b/btt/inlines.h
@@ -18,38 +18,30 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#if defined(DO_INLINE)
-#      define INLINE_PREFIX    static inline
-#      define INLINE_DECLARE
-#else
-#      define INLINE_PREFIX
-#endif
-
 static inline void dbg_ping(void) { }
 
-#if defined(INLINE_DECLARE)
-INLINE_PREFIX void *zmalloc(size_t len)
+static inline void *zmalloc(size_t len)
 {
        return memset(malloc(len), 0, len);
 }
 
-INLINE_PREFIX int is_dev(struct io *iop, unsigned int mjr, unsigned int mnr)
+static inline int is_dev(struct io *iop, unsigned int mjr, unsigned int mnr)
 {
        return MAJOR(iop->t.device) == mjr && MINOR(iop->t.device) == mnr;
 }
 
-INLINE_PREFIX int in_bit(struct io *in, struct io *out)
+static inline int in_bit(struct io *in, struct io *out)
 {
        return (BIT_START(out) <= BIT_START(in)) &&
               (BIT_END(in) <= BIT_END(out));
 }
 
-INLINE_PREFIX int is_bit(struct io *i1, struct io *i2)
+static inline int is_bit(struct io *i1, struct io *i2)
 {
        return (BIT_START(i1) == BIT_START(i2)) && (BIT_END(i1) == BIT_END(i2));
 }
 
-INLINE_PREFIX struct range_info *new_cur(__u64 time)
+static inline struct range_info *new_cur(__u64 time)
 {
        struct range_info *cur = zmalloc(sizeof(*cur));
 
@@ -58,7 +50,7 @@ INLINE_PREFIX struct range_info *new_cur(__u64 time)
        return cur;
 }
 
-INLINE_PREFIX  void update_range(struct list_head *head_p,
+static inline  void update_range(struct list_head *head_p,
                                 struct range_info **cur_p, __u64 time)
 {
        if (*cur_p == NULL)
@@ -74,24 +66,24 @@ INLINE_PREFIX  void update_range(struct list_head *head_p,
        (*cur_p)->end = time;
 }
 
-INLINE_PREFIX void init_region(struct region_info *reg)
+static inline void init_region(struct region_info *reg)
 {
        INIT_LIST_HEAD(&reg->qranges);
        INIT_LIST_HEAD(&reg->cranges);
        reg->qr_cur = reg->cr_cur = NULL;
 }
 
-INLINE_PREFIX void update_qregion(struct region_info *reg, __u64 time)
+static inline void update_qregion(struct region_info *reg, __u64 time)
 {
        update_range(&reg->qranges, &reg->qr_cur, time);
 }
 
-INLINE_PREFIX void update_cregion(struct region_info *reg, __u64 time)
+static inline void update_cregion(struct region_info *reg, __u64 time)
 {
        update_range(&reg->cranges, &reg->cr_cur, time);
 }
 
-INLINE_PREFIX void avg_update(struct avg_info *ap, __u64 t)
+static inline void avg_update(struct avg_info *ap, __u64 t)
 {
         if (ap->n++ == 0)
                 ap->min = ap->total = ap->max = t;
@@ -104,36 +96,36 @@ INLINE_PREFIX void avg_update(struct avg_info *ap, __u64 t)
         }
 }
 
-INLINE_PREFIX void update_lq(__u64 *last_q, struct avg_info *avg, __u64 time)
+static inline void update_lq(__u64 *last_q, struct avg_info *avg, __u64 time)
 {
        if (*last_q != ((__u64)-1))
                avg_update(avg, time - *last_q);
        *last_q = time;
 }
 
-INLINE_PREFIX struct list_head *dip_get_head(struct d_info *dip,
+static inline struct list_head *dip_get_head(struct d_info *dip,
                                              enum iop_type type)
 {
        return &dip->iop_heads[type];
 }
 
-INLINE_PREFIX struct list_head *dip_get_head_dev(__u32 dev, enum iop_type type)
+static inline struct list_head *dip_get_head_dev(__u32 dev, enum iop_type type)
 {
        return dip_get_head(__dip_find(dev), type);
 }
 
-INLINE_PREFIX void dip_update_q(struct d_info *dip, struct io *iop)
+static inline void dip_update_q(struct d_info *dip, struct io *iop)
 {
        update_lq(&dip->last_q, &dip->avgs.q2q, iop->t.time);
        update_qregion(&dip->regions, iop->t.time);
 }
 
-INLINE_PREFIX void dip_rem(struct io *iop)
+static inline void dip_rem(struct io *iop)
 {
        LIST_DEL(&iop->dev_head);
 }
 
-INLINE_PREFIX void *my_malloc(struct my_mem **head_p, size_t len)
+static inline void *my_malloc(struct my_mem **head_p, size_t len)
 {
        struct my_mem *this = *head_p;
 
@@ -145,12 +137,12 @@ INLINE_PREFIX void *my_malloc(struct my_mem **head_p, size_t len)
        return this;
 }
 
-INLINE_PREFIX void *my_zmalloc(struct my_mem **head_p, size_t len)
+static inline void *my_zmalloc(struct my_mem **head_p, size_t len)
 {
        return memset(my_malloc(head_p, len), 0, len);
 }
 
-INLINE_PREFIX void my_free(struct my_mem **head_p, void *p)
+static inline void my_free(struct my_mem **head_p, void *p)
 {
        struct my_mem *this = p;
 
@@ -158,7 +150,7 @@ INLINE_PREFIX void my_free(struct my_mem **head_p, void *p)
        *head_p = this;
 }
 
-INLINE_PREFIX void io_setup(struct io *iop, enum iop_type type)
+static inline void io_setup(struct io *iop, enum iop_type type)
 {
        iop->type = type;
        iop->dip = dip_add(iop->t.device, iop);
@@ -168,7 +160,7 @@ INLINE_PREFIX void io_setup(struct io *iop, enum iop_type type)
        list_add_tail(&iop->all_head, &all_ios);
 }
 
-INLINE_PREFIX void io_free(struct io *iop)
+static inline void io_free(struct io *iop)
 {
        ASSERT(iop->users == 0);
 
@@ -178,18 +170,18 @@ INLINE_PREFIX void io_free(struct io *iop)
        n_io_frees++;
 }
 
-INLINE_PREFIX void io_get(struct io *iop)
+static inline void io_get(struct io *iop)
 {
        iop->users++;
 }
 
 
-INLINE_PREFIX int __io_put(struct io *iop)
+static inline int __io_put(struct io *iop)
 {
        return --iop->users;
 }
 
-INLINE_PREFIX void io_put(struct io *iop)
+static inline void io_put(struct io *iop)
 {
        if (__io_put(iop) == 0) {
                io_free_resources(iop);
@@ -197,14 +189,14 @@ INLINE_PREFIX void io_put(struct io *iop)
        }
 }
 
-INLINE_PREFIX void io_link(struct io **p_dst, struct io *iop)
+static inline void io_link(struct io **p_dst, struct io *iop)
 {
        ASSERT(iop != NULL);
        io_get(iop);
        *p_dst = iop;
 }
 
-INLINE_PREFIX void io_unlink(struct io **p_dst)
+static inline void io_unlink(struct io **p_dst)
 {
        ASSERT(*p_dst != NULL);
        io_put(*p_dst);
@@ -220,32 +212,32 @@ INLINE_PREFIX void io_unlink(struct io **p_dst)
                if (_pip) avg_update(&_pip->avgs. _avg , _time);        \
        } while (0)
 
-INLINE_PREFIX void update_q2c(struct io *iop, __u64 c_time)
+static inline void update_q2c(struct io *iop, __u64 c_time)
 {
        UPDATE_AVGS(q2c, iop, iop->pip, c_time);
 }
 
-INLINE_PREFIX void update_q2a(struct io *iop, __u64 a_time)
+static inline void update_q2a(struct io *iop, __u64 a_time)
 {
        UPDATE_AVGS(q2a, iop, iop->pip, a_time);
 }
 
-INLINE_PREFIX void update_q2i(struct io *iop, __u64 i_time)
+static inline void update_q2i(struct io *iop, __u64 i_time)
 {
        UPDATE_AVGS(q2i, iop, iop->pip, i_time);
 }
 
-INLINE_PREFIX void update_i2d(struct io *iop, __u64 d_time)
+static inline void update_i2d(struct io *iop, __u64 d_time)
 {
        UPDATE_AVGS(i2d, iop, iop->pip, d_time);
 }
 
-INLINE_PREFIX void update_d2c(struct io *iop, __u64 c_time)
+static inline void update_d2c(struct io *iop, __u64 c_time)
 {
        UPDATE_AVGS(d2c, iop, iop->pip, c_time);
 }
 
-INLINE_PREFIX void update_blks(struct io *iop)
+static inline void update_blks(struct io *iop)
 {
        __u64 nblks = iop->t.bytes >> 9;
        avg_update(&all_avgs.blks, nblks);
@@ -253,38 +245,3 @@ INLINE_PREFIX void update_blks(struct io *iop)
        if (iop->pip)
                avg_update(&iop->pip->avgs.blks, nblks);
 }
-#else
-void *zmalloc(size_t len);
-int is_dev(struct io *iop, unsigned int mjr, unsigned int mnr);
-int in_bit(struct io *in, struct io *out);
-int is_bit(struct io *i1, struct io *i2);
-struct range_info *new_cur(__u64 time);
-void update_range(struct list_head *head_p,
-                                struct range_info **cur_p, __u64 time);
-void init_region(struct region_info *reg);
-void update_qregion(struct region_info *reg, __u64 time);
-void update_cregion(struct region_info *reg, __u64 time);
-void avg_update(struct avg_info *ap, __u64 t);
-void update_lq(__u64 *last_q, struct avg_info *avg, __u64 time);
-struct list_head *dip_get_head(struct d_info *dip, enum iop_type type);
-void dip_update_q(struct d_info *dip, struct io *iop);
-void dip_rem(struct io *iop);
-void io_log(char *header, struct io *iop);
-void *my_malloc(struct my_mem **head_p, size_t len);
-void *my_zmalloc(struct my_mem **head_p, size_t len);
-void my_free(struct my_mem **head_p, void *p);
-void io_setup(struct io *iop, enum iop_type type);
-void io_free(struct io *iop);
-void io_get(struct io *iop);
-int __io_put(struct io *iop);
-void io_put(struct io *iop);
-void io_link(struct io **p_dst, struct io *iop);
-void io_unlink(struct io **p_dst);
-void update_q2c(struct io *iop, __u64 d_time);
-void update_q2a(struct io *iop, __u64 d_time);
-void update_q2i(struct io *iop, __u64 d_time);
-void update_i2d(struct io *iop, __u64 d_time);
-void update_d2c(struct io *iop, __u64 d_time);
-void update_blks(struct io *iop);
-struct list_head *dip_get_head_dev(__u32 dev, enum iop_type type);
-#endif