Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+9
-4
+4
-3
fs/ceph/mdsmap.c
+4
-3
fs/ceph/mdsmap.c
···
380
380
ceph_decode_skip_8(p, end, bad_ext);
381
381
/* required_client_features */
382
382
ceph_decode_skip_set(p, end, 64, bad_ext);
383
+
/* bal_rank_mask */
384
+
ceph_decode_skip_string(p, end, bad_ext);
385
+
}
386
+
if (mdsmap_ev >= 18) {
383
387
ceph_decode_64_safe(p, end, m->m_max_xattr_size, bad_ext);
384
-
} else {
385
-
/* This forces the usage of the (sync) SETXATTR Op */
386
-
m->m_max_xattr_size = 0;
387
388
}
388
389
bad_ext:
389
390
doutc(cl, "m_enabled: %d, m_damaged: %d, m_num_laggy: %d\n",
+5
-1
fs/ceph/mdsmap.h
+5
-1
fs/ceph/mdsmap.h
···
27
27
u32 m_session_timeout; /* seconds */
28
28
u32 m_session_autoclose; /* seconds */
29
29
u64 m_max_file_size;
30
-
u64 m_max_xattr_size; /* maximum size for xattrs blob */
30
+
/*
31
+
* maximum size for xattrs blob.
32
+
* Zeroed by default to force the usage of the (sync) SETXATTR Op.
33
+
*/
34
+
u64 m_max_xattr_size;
31
35
u32 m_max_mds; /* expected up:active mds number */
32
36
u32 m_num_active_mds; /* actual up:active mds number */
33
37
u32 possible_max_rank; /* possible max rank index */