From patchwork Mon Sep 14 13:51:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 7176411 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 986009F314 for ; Mon, 14 Sep 2015 13:51:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C24A3206BC for ; Mon, 14 Sep 2015 13:51:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4DEB620686 for ; Mon, 14 Sep 2015 13:51:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755330AbbINNvr (ORCPT ); Mon, 14 Sep 2015 09:51:47 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:36000 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755226AbbINNvq (ORCPT ); Mon, 14 Sep 2015 09:51:46 -0400 Received: by wicgb1 with SMTP id gb1so142882390wic.1 for ; Mon, 14 Sep 2015 06:51:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=EplGyMzkEvxY8IjRDZVL+Zm8zrguDVO+upme2EDuZnE=; b=LJjmhizM28E/WIMcZ9q7WTdRWMokvMFtLUzC1hxhloz3NWRhl94l/jy05GncM3laGY y1h2NOteTI2H3dxmokNErg8X2UvolX2Ee+r4Hctls3IcyL0yv1Cc+SWitTOovcpf8jlm BGe3TCsD6MG5zf3IguByGekfuJaDlGWU9vFJO39C41rykKcB1n+JI8qUu2Qk2PqkUmf5 jdYwrm1rdmYluYzCMOwBueBy1OerJ75RyxiPe10x12PjDiKnqJZZULgqIYfyJ+SNAgAm buNSp8XZYP2phurkl3YSsXzphKoDLrQxqYAap4ffrgkGmeWNzTnsq11a7ewBPybhBc8y Ug4w== X-Received: by 10.180.76.231 with SMTP id n7mr26499907wiw.65.1442238703871; Mon, 14 Sep 2015 06:51:43 -0700 (PDT) Received: from orange.local.localdomain ([109.110.66.71]) by smtp.gmail.com with ESMTPSA id i7sm14480448wib.15.2015.09.14.06.51.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Sep 2015 06:51:43 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH] libceph: advertise support for keepalive2 Date: Mon, 14 Sep 2015 16:51:35 +0300 Message-Id: <1442238695-13809-1-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 1.9.3 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Yan, Zheng --- include/linux/ceph/ceph_features.h | 1 + 1 file changed, 1 insertion(+) 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 \