summaryrefslogtreecommitdiffstats
path: root/net/ceph
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2017-06-05 14:44:59 +0200
committerIlya Dryomov <idryomov@gmail.com>2017-07-07 17:25:14 +0200
commitdcbbd97ccb9c6f4dad39875c1404d2643eaf110b (patch)
tree4e7ddd532e64999531009dd61a3f49bab8e09fe0 /net/ceph
parent481f001ffa5d8e9d72f8206e92f73ded076eeb30 (diff)
downloadlinux-stable-dcbbd97ccb9c6f4dad39875c1404d2643eaf110b.tar.gz
linux-stable-dcbbd97ccb9c6f4dad39875c1404d2643eaf110b.tar.bz2
linux-stable-dcbbd97ccb9c6f4dad39875c1404d2643eaf110b.zip
libceph: remove ceph_sanitize_features() workaround
Reflects ceph.git commit ff1959282826ae6acd7134e1b1ede74ffd1cc04a. Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'net/ceph')
-rw-r--r--net/ceph/messenger.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 588a91930051..9daed2540639 100644
--- 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);