aboutsummaryrefslogtreecommitdiffstats
path: root/net/ceph
diff options
context:
space:
mode:
authorIlya Dryomov <ilya.dryomov@inktank.com>2013-12-24 14:19:24 -0500
committerIlya Dryomov <ilya.dryomov@inktank.com>2013-12-31 13:32:09 -0500
commit2b3e0c905af43cfe402a2ef3f800be5dc1684005 (patch)
treec55a1ab35c2fae59429e33acbd5dcd61f24a8a01 /net/ceph
parent12b4629a9fb80fecaebadc217b13b8776ed8dbef (diff)
libceph: update ceph_features.h
This updates ceph_features.h so that it has all feature bits defined in ceph.git. In the interim since the last update, ceph.git crossed the "32 feature bits" point, and, the addition of the 33rd bit wasn't handled correctly. The work-around is squashed into this commit and reflects ceph.git commit 053659d05e0349053ef703b414f44965f368b9f0. Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net/ceph')
-rw-r--r--net/ceph/messenger.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 260670558746..bd172e1ee0ae 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -15,6 +15,7 @@
15#include <linux/dns_resolver.h> 15#include <linux/dns_resolver.h>
16#include <net/tcp.h> 16#include <net/tcp.h>
17 17
18#include <linux/ceph/ceph_features.h>
18#include <linux/ceph/libceph.h> 19#include <linux/ceph/libceph.h>
19#include <linux/ceph/messenger.h> 20#include <linux/ceph/messenger.h>
20#include <linux/ceph/decode.h> 21#include <linux/ceph/decode.h>
@@ -1945,7 +1946,8 @@ static int process_connect(struct ceph_connection *con)
1945{ 1946{
1946 u64 sup_feat = con->msgr->supported_features; 1947 u64 sup_feat = con->msgr->supported_features;
1947 u64 req_feat = con->msgr->required_features; 1948 u64 req_feat = con->msgr->required_features;
1948 u64 server_feat = le64_to_cpu(con->in_reply.features); 1949 u64 server_feat = ceph_sanitize_features(
1950 le64_to_cpu(con->in_reply.features));
1949 int ret; 1951 int ret;
1950 1952
1951 dout("process_connect on %p tag %d\n", con, (int)con->in_tag); 1953 dout("process_connect on %p tag %d\n", con, (int)con->in_tag);