Commit 5870ba3d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-6.8-rc7' of https://github.com/ceph/ceph-client 

Pull ceph fix from Ilya Dryomov:
 "Catch up with mdsmap encoding rectification which ended up being
  necessary after all to enable cluster upgrades from problematic
  v18.2.0 and v18.2.1 releases"

* tag 'ceph-for-6.8-rc7' of https://github.com/ceph/ceph-client:
  ceph: switch to corrected encoding of max_xattr_size in mdsmap
parents 7505aa14 51d31149

fs/ceph/mdsmap.c

+4 −3
Original line number Diff line number Diff line
@@ -380,10 +380,11 @@ struct ceph_mdsmap *ceph_mdsmap_decode(struct ceph_mds_client *mdsc, void **p, 
		ceph_decode_skip_8(p, end, bad_ext);

		/* required_client_features */

		ceph_decode_skip_set(p, end, 64, bad_ext);

		/* bal_rank_mask */

		ceph_decode_skip_string(p, end, bad_ext);

	}

	if (mdsmap_ev >= 18) {

		ceph_decode_64_safe(p, end, m->m_max_xattr_size, bad_ext);

	} else {

		/* This forces the usage of the (sync) SETXATTR Op */

		m->m_max_xattr_size = 0;

	}

bad_ext:

	doutc(cl, "m_enabled: %d, m_damaged: %d, m_num_laggy: %d\n",

fs/ceph/mdsmap.h

+5 −1
Original line number Diff line number Diff line
@@ -27,7 +27,11 @@ struct ceph_mdsmap { 
	u32 m_session_timeout;          /* seconds */

	u32 m_session_autoclose;        /* seconds */

	u64 m_max_file_size;

	u64 m_max_xattr_size;		/* maximum size for xattrs blob */

	/*

	 * maximum size for xattrs blob.

	 * Zeroed by default to force the usage of the (sync) SETXATTR Op.

	 */

	u64 m_max_xattr_size;

	u32 m_max_mds;			/* expected up:active mds number */

	u32 m_num_active_mds;		/* actual up:active mds number */

	u32 possible_max_rank;		/* possible max rank index */