The patch titled
Subject: drbd: fix merge clash: wait_event_lock_irq() is now defined in wait.h
has been added to the -mm tree. Its filename is
wait-add-wait_event_lock_irq-interface-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Lars Ellenberg <lars.ellenberg@xxxxxxxxxx>
Subject: drbd: fix merge clash: wait_event_lock_irq() is now defined in wait.h
Signed-off-by: Lars Ellenberg <lars.ellenberg@xxxxxxxxxx>
Cc: Lukas Czerner <lczerner@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/drbd/drbd_int.h | 27 ---------------------------
drivers/block/drbd/drbd_state.c | 3 +--
2 files changed, 1 insertion(+), 29 deletions(-)
diff -puN drivers/block/drbd/drbd_int.h~wait-add-wait_event_lock_irq-interface-fix drivers/block/drbd/drbd_int.h
--- a/drivers/block/drbd/drbd_int.h~wait-add-wait_event_lock_irq-interface-fix
+++ a/drivers/block/drbd/drbd_int.h
@@ -2334,30 +2334,3 @@ static inline void drbd_md_flush(struct
}
#endif
-
-/* This is defined in drivers/md/md.h as well. Should go into wait.h */
-#define __wait_event_lock_irq(wq, condition, lock, cmd) \
-do { \
- wait_queue_t __wait; \
- init_waitqueue_entry(&__wait, current); \
- \
- add_wait_queue(&wq, &__wait); \
- for (;;) { \
- set_current_state(TASK_UNINTERRUPTIBLE); \
- if (condition) \
- break; \
- spin_unlock_irq(&lock); \
- cmd; \
- schedule(); \
- spin_lock_irq(&lock); \
- } \
- current->state = TASK_RUNNING; \
- remove_wait_queue(&wq, &__wait); \
-} while (0)
-
-#define wait_event_lock_irq(wq, condition, lock, cmd) \
-do { \
- if (condition) \
- break; \
- __wait_event_lock_irq(wq, condition, lock, cmd); \
-} while (0)
diff -puN drivers/block/drbd/drbd_state.c~wait-add-wait_event_lock_irq-interface-fix drivers/block/drbd/drbd_state.c
--- a/drivers/block/drbd/drbd_state.c~wait-add-wait_event_lock_irq-interface-fix
+++ a/drivers/block/drbd/drbd_state.c
@@ -1800,8 +1800,7 @@ _conn_request_state(struct drbd_tconn *t
spin_lock_irq(&tconn->req_lock);
wait_event_lock_irq(tconn->ping_wait,
(rv = _conn_rq_cond(tconn, mask, val)),
- tconn->req_lock,
- );
+ tconn->req_lock);
clear_bit(CONN_WD_ST_CHG_REQ, &tconn->flags);
if (rv < SS_SUCCESS)
goto abort;
_
Patches currently in -mm which might be from lars.ellenberg@xxxxxxxxxx are
linux-next.patch
wait-add-wait_event_lock_irq-interface-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
