Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cecb730 authored by Jens Axboe's avatar Jens Axboe
Browse files

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: default avatarJens Axboe <axboe@kernel.dk>
parent 7b5a3522

drivers/block/drbd/drbd_int.h

+0 −27
Original line number Diff line number Diff line
@@ -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)

drivers/block/drbd/drbd_state.c

+1 −2
Original line number Diff line number Diff line
@@ -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;