diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-11-30 21:20:15 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-11-30 21:20:15 +0100 |
| commit | 2cecb7309897c872b977a60d53e5de0af4265dd6 (patch) | |
| tree | d48284c1edb9ed24d3afa57ba18441d345a5b20c /drivers/block | |
| parent | loop: Limit the number of requests in the bio list (diff) | |
| download | linux-2cecb7309897c872b977a60d53e5de0af4265dd6.tar.xz linux-2cecb7309897c872b977a60d53e5de0af4265dd6.zip | |
drbd: fixup after wait_even_lock_irq() addition to generic code
Compiling drbd yields:
drivers/block/drbd/drbd_state.c: In function ‘_conn_request_state’:
drivers/block/drbd/drbd_state.c:1804:5: error: macro "wait_event_lock_irq" passed 4 arguments, but takes just 3
drivers/block/drbd/drbd_state.c:1801:3: error: ‘wait_event_lock_irq’ undeclared (first use in this function)
drivers/block/drbd/drbd_state.c:1801:3: note: each undeclared identifier is reported only once for each function it appears in
drivers/block/drbd/drbd_state.c: At top level:
drivers/block/drbd/drbd_state.c:1734:1: warning: ‘_conn_rq_cond’ defined but not used [-Wunused-function]
Due to drbd having copied the MD definition for wait_event_lock_irq()
as well. Kill them.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 27 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_state.c | 3 |
2 files changed, 1 insertions, 29 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index ef72a72814c7..6b51afa1aae1 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -2334,30 +2334,3 @@ static inline void drbd_md_flush(struct drbd_conf *mdev) } #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 --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index 69ef35266bac..53bf6182bac4 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -1800,8 +1800,7 @@ _conn_request_state(struct drbd_tconn *tconn, union drbd_state mask, union drbd_ 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; |