Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f2bc3ff authored by Sage Weil's avatar Sage Weil
Browse files

ceph: clean up connection reset 



Reset out_keepalive_pending and peer_global_seq, and drop unused var.

Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent bb257664

fs/ceph/messenger.c

+2 −0
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ static void reset_connection(struct ceph_connection *con) 
		ceph_msg_put(con->out_msg);

		con->out_msg = NULL;

	}

	con->out_keepalive_pending = false;

	con->in_seq = 0;

	con->in_seq_acked = 0;

}
@@ -357,6 +358,7 @@ void ceph_con_close(struct ceph_connection *con) 
	clear_bit(WRITE_PENDING, &con->state);

	mutex_lock(&con->mutex);

	reset_connection(con);

	con->peer_global_seq = 0;

	cancel_delayed_work(&con->work);

	mutex_unlock(&con->mutex);

	queue_con(con);

fs/ceph/messenger.h

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ struct ceph_connection { 
	struct list_head out_queue;

	struct list_head out_sent;   /* sending or sent but unacked */

	u64 out_seq;		     /* last message queued for send */

	u64 out_seq_sent;            /* last message sent */

	bool out_keepalive_pending;



	u64 in_seq, in_seq_acked;  /* last message received, acked */