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

Commit 8a61716f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-5.0-rc8' of git://github.com/ceph/ceph-client 

Pull ceph fixes from Ilya Dryomov:
 "Two bug fixes for old issues, both marked for stable"

* tag 'ceph-for-5.0-rc8' of git://github.com/ceph/ceph-client:
  ceph: avoid repeatedly adding inode to mdsc->snap_flush_list
  libceph: handle an empty authorize reply
parents d6622d91 04242ff3

fs/ceph/snap.c

+2 −1
Original line number Diff line number Diff line
@@ -616,6 +616,7 @@ int __ceph_finish_cap_snap(struct ceph_inode_info *ci, 
	     capsnap->size);



	spin_lock(&mdsc->snap_flush_lock);

	if (list_empty(&ci->i_snap_flush_item))

		list_add_tail(&ci->i_snap_flush_item, &mdsc->snap_flush_list);

	spin_unlock(&mdsc->snap_flush_lock);

	return 1;  /* caller may want to ceph_flush_snaps */

net/ceph/messenger.c

+9 −6
Original line number Diff line number Diff line
@@ -2058,6 +2058,8 @@ static int process_connect(struct ceph_connection *con) 
	dout("process_connect on %p tag %d\n", con, (int)con->in_tag);



	if (con->auth) {

		int len = le32_to_cpu(con->in_reply.authorizer_len);



		/*

		 * Any connection that defines ->get_authorizer()

		 * should also define ->add_authorizer_challenge() and
@@ -2067,8 +2069,7 @@ static int process_connect(struct ceph_connection *con) 
		 */

		if (con->in_reply.tag == CEPH_MSGR_TAG_CHALLENGE_AUTHORIZER) {

			ret = con->ops->add_authorizer_challenge(

				    con, con->auth->authorizer_reply_buf,

				    le32_to_cpu(con->in_reply.authorizer_len));

				    con, con->auth->authorizer_reply_buf, len);

			if (ret < 0)

				return ret;
@@ -2078,12 +2079,14 @@ static int process_connect(struct ceph_connection *con) 
			return 0;

		}



		if (len) {

			ret = con->ops->verify_authorizer_reply(con);

			if (ret < 0) {

				con->error_msg = "bad authorize reply";

				return ret;

			}

		}

	}



	switch (con->in_reply.tag) {

	case CEPH_MSGR_TAG_FEATURES: