From 9c0da3b13b4e0139a82b58d6cc3da5e6b47a5bfb Mon Sep 17 00:00:00 2001 From: Patrick Caulfield Date: Tue, 2 Jan 2007 17:01:05 +0000 Subject: [PATCH] --- yaml --- r: 46279 b: refs/heads/master c: 3fb4a251febe70e4c65ea8250545b391fd414d5a h: refs/heads/master i: 46277: 7c7d1d685e11708ba55abde8cbba85d425c2f7f6 46275: 902e8881044e6461c17c5b4665f68353825a39c3 46271: 1a9e5b77552bf4002e11f474f41aa09ea02e1efa v: v3 --- [refs] | 2 +- trunk/fs/dlm/lowcomms-sctp.c | 4 ++-- trunk/fs/dlm/lowcomms-tcp.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3bd98df579e2..e07f879b3259 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5509826f1e548d14bb888c1cb6e3bbf23f855770 +refs/heads/master: 3fb4a251febe70e4c65ea8250545b391fd414d5a diff --git a/trunk/fs/dlm/lowcomms-sctp.c b/trunk/fs/dlm/lowcomms-sctp.c index fe158d7a9285..0940a805b3d7 100644 --- a/trunk/fs/dlm/lowcomms-sctp.c +++ b/trunk/fs/dlm/lowcomms-sctp.c @@ -1109,7 +1109,7 @@ static int dlm_recvd(void *data) set_current_state(TASK_INTERRUPTIBLE); add_wait_queue(&lowcomms_recv_wait, &wait); if (!test_bit(CF_READ_PENDING, &sctp_con.flags)) - cond_resched(); + schedule(); remove_wait_queue(&lowcomms_recv_wait, &wait); set_current_state(TASK_RUNNING); @@ -1141,7 +1141,7 @@ static int dlm_sendd(void *data) while (!kthread_should_stop()) { set_current_state(TASK_INTERRUPTIBLE); if (write_list_empty()) - cond_resched(); + schedule(); set_current_state(TASK_RUNNING); if (sctp_con.eagain_flag) { diff --git a/trunk/fs/dlm/lowcomms-tcp.c b/trunk/fs/dlm/lowcomms-tcp.c index 3b224733f18b..18b91c65bdb3 100644 --- a/trunk/fs/dlm/lowcomms-tcp.c +++ b/trunk/fs/dlm/lowcomms-tcp.c @@ -996,7 +996,7 @@ static int dlm_recvd(void *data) while (!kthread_should_stop()) { set_current_state(TASK_INTERRUPTIBLE); if (read_list_empty()) - cond_resched(); + schedule(); set_current_state(TASK_RUNNING); process_sockets(); @@ -1030,7 +1030,7 @@ static int dlm_sendd(void *data) while (!kthread_should_stop()) { set_current_state(TASK_INTERRUPTIBLE); if (write_and_state_lists_empty()) - cond_resched(); + schedule(); set_current_state(TASK_RUNNING); process_state_queue();