Update bcachefs sources to 0906b1fb49 bcachefs: fixes for 32 bit/big endian machines

[bcachefs-tools-debian] / linux / workqueue.c

diff --git a/linux/workqueue.c b/linux/workqueue.c
index f5942772dda67adf02723b2dd6620ec868c3a0b3..4dfd6cd9e2099ad4db1d7c109f07fb0f91bb40af 100644 (file)
--- a/linux/workqueue.c
+++ b/linux/workqueue.c
@@ -55,9 +55,10 @@ bool queue_work(struct workqueue_struct *wq, struct work_struct *work)
        return ret;
 }
 
-void delayed_work_timer_fn(unsigned long __data)
+void delayed_work_timer_fn(struct timer_list *timer)
 {
-       struct delayed_work *dwork = (struct delayed_work *) __data;
+       struct delayed_work *dwork =
+               container_of(timer, struct delayed_work, timer);
 
        pthread_mutex_lock(&wq_lock);
        __queue_work(dwork->wq, &dwork->work);
@@ -71,8 +72,7 @@ static void __queue_delayed_work(struct workqueue_struct *wq,
        struct timer_list *timer = &dwork->timer;
        struct work_struct *work = &dwork->work;
 
-       BUG_ON(timer->function != delayed_work_timer_fn ||
-              timer->data != (unsigned long)dwork);
+       BUG_ON(timer->function != delayed_work_timer_fn);
        BUG_ON(timer_pending(timer));
        BUG_ON(!list_empty(&work->entry));