summaryrefslogtreecommitdiff
path: root/net/ceph/messenger.c
diff options
context:
space:
mode:
authorIgor Opaniuk <igor.opaniuk@toradex.com>2020-11-17 11:31:57 +0200
committerIgor Opaniuk <igor.opaniuk@toradex.com>2020-11-17 11:31:57 +0200
commit664411bde9c033778f85f9ae3a74351406642f6a (patch)
tree9e981b04895ab1b0fe6cbe6b5a89af256632fd80 /net/ceph/messenger.c
parent14655070177685c8b390e1caec15da757228be1a (diff)
parent2544d06afd8d060f35b159809274e4b7477e63e8 (diff)
Merge tag 'v5.4.77' into toradex_5.4.y
This is the 5.4.77 stable release
Diffstat (limited to 'net/ceph/messenger.c')
-rw-r--r--net/ceph/messenger.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 3d2e9f944e0f..49726c378aab 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -3007,6 +3007,11 @@ static void con_fault(struct ceph_connection *con)
ceph_msg_put(con->in_msg);
con->in_msg = NULL;
}
+ if (con->out_msg) {
+ BUG_ON(con->out_msg->con != con);
+ ceph_msg_put(con->out_msg);
+ con->out_msg = NULL;
+ }
/* Requeue anything that hasn't been acked */
list_splice_init(&con->out_sent, &con->out_queue);