Skip to content

Commit 23c625c

Browse files
committed
libceph: assume argonaut on the server side
No one is running pre-argonaut. In addition one of the argonaut features (NOSRCADDR) has been required since day one (and a half, 2.6.34 vs 2.6.35) of the kernel client. Allow for the possibility of reusing these feature bits later. Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Reviewed-by: Sage Weil <sage@redhat.com>
1 parent 71f2cc6 commit 23c625c

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

fs/ceph/mds_client.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,8 @@ static int parse_reply_info_in(void **p, void *end,
8080
info->symlink = *p;
8181
*p += info->symlink_len;
8282

83-
if (features & CEPH_FEATURE_DIRLAYOUTHASH)
84-
ceph_decode_copy_safe(p, end, &info->dir_layout,
85-
sizeof(info->dir_layout), bad);
86-
else
87-
memset(&info->dir_layout, 0, sizeof(info->dir_layout));
88-
83+
ceph_decode_copy_safe(p, end, &info->dir_layout,
84+
sizeof(info->dir_layout), bad);
8985
ceph_decode_32_safe(p, end, info->xattr_len, bad);
9086
ceph_decode_need(p, end, info->xattr_len, bad);
9187
info->xattr_data = *p;
@@ -3182,10 +3178,8 @@ static void send_mds_reconnect(struct ceph_mds_client *mdsc,
31823178
recon_state.pagelist = pagelist;
31833179
if (session->s_con.peer_features & CEPH_FEATURE_MDSENC)
31843180
recon_state.msg_version = 3;
3185-
else if (session->s_con.peer_features & CEPH_FEATURE_FLOCK)
3186-
recon_state.msg_version = 2;
31873181
else
3188-
recon_state.msg_version = 1;
3182+
recon_state.msg_version = 2;
31893183
err = iterate_session_caps(session, encode_caps_cb, &recon_state);
31903184
if (err < 0)
31913185
goto fail;

include/linux/ceph/ceph_features.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,6 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin
213213
CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING | \
214214
CEPH_FEATURE_CEPHX_V2)
215215

216-
#define CEPH_FEATURES_REQUIRED_DEFAULT \
217-
(CEPH_FEATURE_NOSRCADDR | \
218-
CEPH_FEATURE_SUBSCRIBE2 | \
219-
CEPH_FEATURE_RECONNECT_SEQ | \
220-
CEPH_FEATURE_PGID64 | \
221-
CEPH_FEATURE_PGPOOL3 | \
222-
CEPH_FEATURE_OSDENC)
216+
#define CEPH_FEATURES_REQUIRED_DEFAULT 0
223217

224218
#endif

0 commit comments

Comments
 (0)