DLM: fix to reschedule rwork

When an error occurs in kernel_recvmsg or kernel_sendpage and
close_connection is called and receive work is already scheduled,
receive work is canceled. In that case, the receive work will not
be scheduled forever after reconnection, because CF_READ_PENDING
flag is established.

Signed-off-by: Tadashi Miyauchi <miyauchi@toshiba-tops.co.jp>
Signed-off-by: Tsutomu Owa <tsutomu.owa@toshiba.co.jp>
Signed-off-by: David Teigland <teigland@redhat.com>

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 5d0de91adc366d822966f7964d39ed6dc2342967..c64e39f76ce897e24ad3887aed3644975b0a68e0 100644 (file)
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -593,10 +593,14 @@ static void close_connection(struct connection *con, bool and_other,
 {
        bool closing = test_and_set_bit(CF_CLOSING, &con->flags);
 
-       if (tx && !closing && cancel_work_sync(&con->swork))
+       if (tx && !closing && cancel_work_sync(&con->swork)) {
                log_print("canceled swork for node %d", con->nodeid);
-       if (rx && !closing && cancel_work_sync(&con->rwork))
+               clear_bit(CF_WRITE_PENDING, &con->flags);
+       }
+       if (rx && !closing && cancel_work_sync(&con->rwork)) {
                log_print("canceled rwork for node %d", con->nodeid);
+               clear_bit(CF_READ_PENDING, &con->flags);
+       }
 
        mutex_lock(&con->sock_mutex);
        if (con->sock) {