libceph: remove ceph_sanitize_features() workaround

Reflects ceph.git commit ff1959282826ae6acd7134e1b1ede74ffd1cc04a.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/include/linux/ceph/ceph_features.h b/include/linux/ceph/ceph_features.h
index fd8b2953c78f85539104fd3741e82a9f37e1e1b5..4962708841b50a006a4d77fdecd868e29aadbd31 100644 (file)
--- a/include/linux/ceph/ceph_features.h
+++ b/include/linux/ceph/ceph_features.h
@@ -77,29 +77,8 @@
 #define CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING   (1ULL<<58) /* New, v7 encoding */
 #define CEPH_FEATURE_FS_FILE_LAYOUT_V2       (1ULL<<58) /* file_layout_t */
 
-/*
- * The introduction of CEPH_FEATURE_OSD_SNAPMAPPER caused the feature
- * vector to evaluate to 64 bit ~0.  To cope, we designate 1ULL << 63
- * to mean 33 bit ~0, and introduce a helper below to do the
- * translation.
- *
- * This was introduced by ceph.git commit
- *   9ea02b84104045c2ffd7e7f4e7af512953855ecd v0.58-657-g9ea02b8
- * and fixed by ceph.git commit
- *   4255b5c2fb54ae40c53284b3ab700fdfc7e61748 v0.65-263-g4255b5c
- */
 #define CEPH_FEATURE_RESERVED (1ULL<<63)
 
-static inline u64 ceph_sanitize_features(u64 features)
-{
-       if (features & CEPH_FEATURE_RESERVED) {
-               /* everything through OSD_SNAPMAPPER */
-               return 0x1ffffffffull;
-       } else {
-               return features;
-       }
-}
-
 /*
  * Features supported.
  */

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 588a919300514ad2cd4b843c528bb41e601fa7d8..9daed25406390ac491d8fd2017f5675b3242a824 100644 (file)
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -2033,8 +2033,7 @@ static int process_connect(struct ceph_connection *con)
 {
        u64 sup_feat = from_msgr(con->msgr)->supported_features;
        u64 req_feat = from_msgr(con->msgr)->required_features;
-       u64 server_feat = ceph_sanitize_features(
-                               le64_to_cpu(con->in_reply.features));
+       u64 server_feat = le64_to_cpu(con->in_reply.features);
        int ret;
 
        dout("process_connect on %p tag %d\n", con, (int)con->in_tag);