From 9c97981b1a2066590709a01ceb1dd707ac7f0d62 Mon Sep 17 00:00:00 2001 From: patiencew Date: Wed, 12 Dec 2007 18:01:25 +0000 Subject: [PATCH] were never queuing accept ready git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@2206 29311d96-e01e-0410-9327-a35deaab8ce9 --- trunk/ceph/kernel/messenger.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/trunk/ceph/kernel/messenger.c b/trunk/ceph/kernel/messenger.c index bcf2faf7edb02..613f46c61db66 100644 --- a/trunk/ceph/kernel/messenger.c +++ b/trunk/ceph/kernel/messenger.c @@ -35,7 +35,7 @@ static void ceph_send_fault(struct ceph_connection *con, int error) ntohs(con->peer_addr.ipaddr.sin_port)); if (!con->delay) { - derr(1, "timeout not set\n"); + derr(1, "ceph_send_fault timeout not set\n"); return; } @@ -57,8 +57,7 @@ static void ceph_send_fault(struct ceph_connection *con, int error) list_splice_init(&con->out_sent, &con->out_queue); spin_unlock(&con->out_queue_lock); /* retry with delay */ - queue_delayed_work(send_wq, &con->swork, - BASE_RETRY_INTERVAL); + queue_delayed_work(send_wq, &con->swork, con->delay); break; case -EPIPE: case -ECONNREFUSED: @@ -78,8 +77,7 @@ static void ceph_send_fault(struct ceph_connection *con, int error) } set_bit(NEW, &con->state); /* retry with delay */ - queue_delayed_work(send_wq, &con->swork, - BASE_RETRY_INTERVAL); + queue_delayed_work(send_wq, &con->swork, con->delay); break; case -EIO: derr(1, "EIO set\n"); @@ -802,6 +800,8 @@ static void process_accept(struct ceph_connection *con) prepare_write_accept_reject(con); else prepare_write_accept_ready(con); + /* queue write */ + queue_work(send_wq, &con->swork.work); } -- 2.39.5