summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Dryomov2015-09-14 11:44:22 +0200
committerIlya Dryomov2015-09-17 19:14:27 +0200
commit335c25858218e76ef47f92ecb9d22e919d36140d (patch)
tree3e6465b8aadd87b1ab33a645f98b0af56ca7f48c
parentlibceph: don't access invalid memory in keepalive2 path (diff)
downloadkernel-qcow2-linux-335c25858218e76ef47f92ecb9d22e919d36140d.tar.gz
kernel-qcow2-linux-335c25858218e76ef47f92ecb9d22e919d36140d.tar.xz
kernel-qcow2-linux-335c25858218e76ef47f92ecb9d22e919d36140d.zip
libceph: advertise support for keepalive2
We are the client, but advertise keepalive2 anyway - for consistency, if nothing else. In the future the server might want to know whether its clients support keepalive2. Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Reviewed-by: Yan, Zheng <zyan@redhat.com>
-rw-r--r--include/linux/ceph/ceph_features.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ceph/ceph_features.h b/include/linux/ceph/ceph_features.h
index 4763ad64e832..f89b31d45cc8 100644
--- a/include/linux/ceph/ceph_features.h
+++ b/include/linux/ceph/ceph_features.h
@@ -107,6 +107,7 @@ static inline u64 ceph_sanitize_features(u64 features)
CEPH_FEATURE_OSDMAP_ENC | \
CEPH_FEATURE_CRUSH_TUNABLES3 | \
CEPH_FEATURE_OSD_PRIMARY_AFFINITY | \
+ CEPH_FEATURE_MSGR_KEEPALIVE2 | \
CEPH_FEATURE_CRUSH_V4)
#define CEPH_FEATURES_REQUIRED_DEFAULT \