Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-03 09:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

drbd: Moved SIGNAL_ASENDER to the per connection (tconn) flags

Browse Source 
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Philipp Reisner 2011-02-07 14:44:14 +01:00
parent e43ef195f8
commit 808e37b803
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/block/drbd/drbd_int.h
View File

@ -757,8 +757,6 @@ enum {
/* flag bits per mdev */
enum {
CREATE_BARRIER, /* next P_DATA is preceded by a P_BARRIER */
SIGNAL_ASENDER, /* whether asender wants to be interrupted */
UNPLUG_QUEUED, /* only relevant with kernel 2.4 */
UNPLUG_REMOTE, /* sending a "UnplugRemote" could help */
MD_DIRTY, /* current uuids and flags not yet on disk */
@ -911,6 +909,7 @@ enum {
NET_CONGESTED, /* The data socket is congested */
DISCARD_CONCURRENT, /* Set on one node, cleared on the peer! */
SEND_PING, /* whether asender should send a ping asap */
SIGNAL_ASENDER, /* whether asender wants to be interrupted */
};
struct drbd_tconn { /* is a resource from the config file */
@ -1861,7 +1860,7 @@ drbd_queue_work(struct drbd_work_queue *q, struct drbd_work *w)
static inline void wake_asender(struct drbd_conf *mdev)
{
if (test_bit(SIGNAL_ASENDER, &mdev->flags))
if (test_bit(SIGNAL_ASENDER, &mdev->tconn->flags))
force_sig(DRBD_SIG, mdev->tconn->asender.task);
}

8
drivers/block/drbd/drbd_receiver.c
View File

@ -4580,12 +4580,12 @@ int drbd_asender(struct drbd_thread *thi)
3 < atomic_read(&mdev->unacked_cnt))
drbd_tcp_cork(mdev->tconn->meta.socket);
while (1) {
clear_bit(SIGNAL_ASENDER, &mdev->flags);
clear_bit(SIGNAL_ASENDER, &mdev->tconn->flags);
flush_signals(current);
if (!drbd_process_done_ee(mdev))
goto reconnect;
/* to avoid race with newly queued ACKs */
set_bit(SIGNAL_ASENDER, &mdev->flags);
set_bit(SIGNAL_ASENDER, &mdev->tconn->flags);
spin_lock_irq(&mdev->tconn->req_lock);
empty = list_empty(&mdev->done_ee);
spin_unlock_irq(&mdev->tconn->req_lock);
@ -4605,7 +4605,7 @@ int drbd_asender(struct drbd_thread *thi)
rv = drbd_recv_short(mdev, mdev->tconn->meta.socket,
buf, expect-received, 0);
clear_bit(SIGNAL_ASENDER, &mdev->flags);
clear_bit(SIGNAL_ASENDER, &mdev->tconn->flags);
flush_signals(current);
@ -4688,7 +4688,7 @@ disconnect:
drbd_force_state(mdev, NS(conn, C_DISCONNECTING));
drbd_md_sync(mdev);
}
clear_bit(SIGNAL_ASENDER, &mdev->flags);
clear_bit(SIGNAL_ASENDER, &mdev->tconn->flags);
D_ASSERT(mdev->state.conn < C_CONNECTED);
dev_info(DEV, "asender terminated\n");