diff options
| author | Sage Weil <sage@newdream.net> | 2010-02-13 20:29:31 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-02-13 20:29:31 -0800 |
| commit | 6c5d1a49e5e88ee831117f4b2375829933ad15da (patch) | |
| tree | b96f9e7b77d7adfd763cb1089fc0e414605c361e /fs | |
| parent | 8031049147c58d9d8b6226c3ac31a9d72d053e25 (diff) | |
| download | op-kernel-dev-6c5d1a49e5e88ee831117f4b2375829933ad15da.zip op-kernel-dev-6c5d1a49e5e88ee831117f4b2375829933ad15da.tar.gz | |
ceph: fix msgr to keep sent messages until acked
The test was backwards from commit b3d1dbbd: keep the message if the
connection _isn't_ lossy. This allows the client to continue when the
TCP connection drops for some reason (network glitch) but both ends
survive.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/messenger.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/messenger.c b/fs/ceph/messenger.c index c434178..44bdaf4 100644 --- a/fs/ceph/messenger.c +++ b/fs/ceph/messenger.c @@ -463,11 +463,11 @@ static void prepare_write_message(struct ceph_connection *con) struct ceph_msg, list_head); con->out_msg = m; if (test_bit(LOSSYTX, &con->state)) { + list_del_init(&m->list_head); + } else { /* put message on sent list */ ceph_msg_get(m); list_move_tail(&m->list_head, &con->out_sent); - } else { - list_del_init(&m->list_head); } m->hdr.seq = cpu_to_le64(++con->out_seq); |
