2012-11-29 06:19:45

by Stephen Rothwell

[permalink] [raw]

Subject: linux-next: build warnings after merge of the akpm tree

---

Hi Andrew,

After merging the akpm tree, today's linux-next build (x86_64
allmodconfig) produced these warnings:

In file included from drivers/block/drbd/drbd_bitmap.c:32:0:
drivers/block/drbd/drbd_int.h:2339:0: warning: "__wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:554:0: note: this is the location of the previous definition
drivers/block/drbd/drbd_int.h:2358:0: warning: "wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:621:0: note: this is the location of the previous definition
In file included from drivers/block/drbd/drbd_receiver.c:46:0:
drivers/block/drbd/drbd_int.h:2339:0: warning: "__wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:554:0: note: this is the location of the previous definition
drivers/block/drbd/drbd_int.h:2358:0: warning: "wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:621:0: note: this is the location of the previous definition
In file included from drivers/block/drbd/drbd_proc.c:34:0:
drivers/block/drbd/drbd_int.h:2339:0: warning: "__wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:554:0: note: this is the location of the previous definition
drivers/block/drbd/drbd_int.h:2358:0: warning: "wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:621:0: note: this is the location of the previous definition
In file included from drivers/block/drbd/drbd_worker.c:38:0:
drivers/block/drbd/drbd_int.h:2339:0: warning: "__wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:554:0: note: this is the location of the previous definition
drivers/block/drbd/drbd_int.h:2358:0: warning: "wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:621:0: note: this is the location of the previous definition
In file included from drivers/block/drbd/drbd_actlog.c:31:0:
drivers/block/drbd/drbd_int.h:2339:0: warning: "__wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:554:0: note: this is the location of the previous definition
drivers/block/drbd/drbd_int.h:2358:0: warning: "wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:621:0: note: this is the location of the previous definition
In file included from drivers/block/drbd/drbd_req.c:30:0:
drivers/block/drbd/drbd_int.h:2339:0: warning: "__wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:554:0: note: this is the location of the previous definition
drivers/block/drbd/drbd_int.h:2358:0: warning: "wait_event_lock_irq" redefined [enabled by default]
include/linux/wait.h:621:0: note: this is the location of the previous definition

Introduced by the interaction of commit c1fd29a11f43 ("drbd: Fix a race
condition that can lead to a BUG()") from the block tree and commit
"wait: add wait_event_lock_irq() interface" from the akpm tree.

--
Cheers,
Stephen Rothwell [email protected]

---

Attachments:

(No filename) (2.88 kB)
(No filename) (836.00 B)
Download all attachments

2012-11-29 07:24:38

by Lars Ellenberg

[permalink] [raw]

Subject: Re: linux-next: build warnings after merge of the akpm tree

---

On Thu, Nov 29, 2012 at 05:19:39PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> After merging the akpm tree, today's linux-next build (x86_64
> allmodconfig) produced these warnings:


> In file included from drivers/block/drbd/drbd_bitmap.c:32:0:
> drivers/block/drbd/drbd_int.h:2339:0: warning: "__wait_event_lock_irq" redefined [enabled by default]
> include/linux/wait.h:554:0: note: this is the location of the previous definition

> Introduced by the interaction of commit c1fd29a11f43 ("drbd: Fix a race
> condition that can lead to a BUG()") from the block tree and commit
> "wait: add wait_event_lock_irq() interface" from the akpm tree.

Thanks.
We can just drop our copy-n-paste-from-md.h then.

Lars

---------------------------

commit 2712ab592def9f0171b6d47349879e975db57657
Author: Lars Ellenberg <[email protected]>
Date: Thu Nov 29 08:20:27 2012 +0100

drbd: fix merge clash: wait_event_lock_irq() is now defined in wait.h

Signed-off-by: Lars Ellenberg <[email protected]>

diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index ef72a72..6b51afa 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 69ef352..53bf618 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;