openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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:40:40 +01:00
parent 25703f8320
commit e43ef195f8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -758,7 +758,6 @@ enum {
enum {
CREATE_BARRIER, /* next P_DATA is preceded by a P_BARRIER */
SIGNAL_ASENDER, /* whether asender wants to be interrupted */
SEND_PING, /* whether asender should send a ping asap */
UNPLUG_QUEUED, /* only relevant with kernel 2.4 */
UNPLUG_REMOTE, /* sending a "UnplugRemote" could help */
@ -911,6 +910,7 @@ struct fifo_buffer {
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 */
};
struct drbd_tconn { /* is a resource from the config file */
@ -1867,7 +1867,7 @@ static inline void wake_asender(struct drbd_conf *mdev)
static inline void request_ping(struct drbd_conf *mdev)
{
set_bit(SEND_PING, &mdev->flags);
set_bit(SEND_PING, &mdev->tconn->flags);
wake_asender(mdev);
}

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

@ -4564,7 +4564,7 @@ int drbd_asender(struct drbd_thread *thi)
while (get_t_state(thi) == RUNNING) {
drbd_thread_current_set_cpu(mdev, thi);
if (test_and_clear_bit(SEND_PING, &mdev->flags)) {
if (test_and_clear_bit(SEND_PING, &mdev->tconn->flags)) {
if (!drbd_send_ping(mdev)) {
dev_err(DEV, "drbd_send_ping has failed\n");
goto reconnect;
@ -4635,7 +4635,7 @@ int drbd_asender(struct drbd_thread *thi)
dev_err(DEV, "PingAck did not arrive in time.\n");
goto reconnect;
}
set_bit(SEND_PING, &mdev->flags);
set_bit(SEND_PING, &mdev->tconn->flags);
continue;
} else if (rv == -EINTR) {
continue;