X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Finclude%2Fliblustre.h;h=c562e75ee4c4737f7ce2f45b387b3fc06b4a9a87;hb=83f755685e50da38cb916ae4fb83f62429b5d568;hp=67f0066a63931cbcf4bb8e49fadc6646b8b0daff;hpb=64e55eda50049b1d990361cdf8e734867a5f1ddd;p=fs%2Flustre-release.git diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h index 67f0066..c562e75 100644 --- a/lustre/include/liblustre.h +++ b/lustre/include/liblustre.h @@ -609,9 +609,9 @@ static inline int capable(int cap) #define DECLARE_WAIT_QUEUE_HEAD(HEAD) \ wait_queue_head_t HEAD = { \ - .sleepers = LIST_HEAD_INIT(HEAD.sleepers) \ + .sleepers = CFS_LIST_HEAD_INIT(HEAD.sleepers) \ } -#define init_waitqueue_head(l) INIT_LIST_HEAD(&(l)->sleepers) +#define init_waitqueue_head(l) CFS_INIT_LIST_HEAD(&(l)->sleepers) #define wake_up(l) do { int a; a++; } while (0) #define TASK_INTERRUPTIBLE 0 #define TASK_UNINTERRUPTIBLE 1 @@ -682,7 +682,7 @@ static inline int timer_pending(struct timer_list *l) static inline int init_timer(struct timer_list *l) { - INIT_LIST_HEAD(&l->tl_list); + CFS_INIT_LIST_HEAD(&l->tl_list); return 0; }