From patchwork Thu Nov 8 14:31:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 10674349 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ADC38109C for ; Thu, 8 Nov 2018 14:32:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 992162DD6F for ; Thu, 8 Nov 2018 14:32:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 979BF2DD89; Thu, 8 Nov 2018 14:32:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 340C72DD83 for ; Thu, 8 Nov 2018 14:32:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726920AbeKIAHp (ORCPT ); Thu, 8 Nov 2018 19:07:45 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:44678 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726417AbeKIAHo (ORCPT ); Thu, 8 Nov 2018 19:07:44 -0500 Received: by mail-wr1-f68.google.com with SMTP id j17-v6so16353407wrq.11 for ; Thu, 08 Nov 2018 06:31:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=UURpHpG0Ni4Nea3cx5h1EoVe8Sc9ovkF1rfWKuta37Q=; b=ArxOCdrnHyLCj7OcE/Aucngk9OigfgDIfUzApcJT4QkdtqED0xCCZBIPDu+vzt4tsD 0PRmKeP2OzGF4Og6VfZUyeDCq2xGLHSzLN73wG9WJN5orUxmJV0pT9Tc5v+TSJP7v1W+ URgnbwcYQ1g85pHO90alpl5qCYFvfINRTguOKYveU9xhsrO9jE3LrNDYuraIt6CkgDO/ m0vFB5sA+RIs5l2Sa6XkWhofCHMlqZgLwf0+SwE+JRiyf/jSXHQT3qeAH6GCNw1jMps6 9jsE1J73zK/EL9Dc3D3eD8RbVHDGQggRx/K5pKc3NLW8L//qeYmoazhoj5beV3hcS9IG pykQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=UURpHpG0Ni4Nea3cx5h1EoVe8Sc9ovkF1rfWKuta37Q=; b=LVhgWq0iCTRmUA1Lp+vt26d5x6mXIE68t9xwsvXdT523vIb6lKaPYjcl0+ZeSaKvpV wWKIGdt60alGnuUeFkKPJw8y4xPHJ5cCl8ZWpE+T9NjGyU58CbGVlz6Cevuk6b53Yr/u oDwSYEGi9uQTiN4QZj3fKXOOHydiHZZJPfB/+SBnFkT0OGM+PCfbjedBI1Yq8rnbMoWK VsTbkRsBOQDNht09rEasoyY/cEP1EWJFDajMxM6rDjT+Uvwj1qn7g1mOzk2cSbAo7pMj F3YEO7soFeWO14rWlmtsMYkMuDd0aVcl4Ly5xZJIDjEOEOwXT3iJD8sie7KGeoLxcxc5 FplQ== X-Gm-Message-State: AGRZ1gKmD+YFGMNLdbjM9KoCv9ExfwqmXW9A2efjvUTchqss3xBM95wz EUjAzgpnqe+G+dOfDbXBoVpo+Skw X-Google-Smtp-Source: AJdET5dcsXaJsHeae7ZZfZaiYlhS9cBb2usD4rixErgIeRDhigkA12b0HYvduNhwgl3GLXcIbUrPLA== X-Received: by 2002:a5d:620b:: with SMTP id y11-v6mr4369079wru.105.1541687516996; Thu, 08 Nov 2018 06:31:56 -0800 (PST) Received: from orange.redhat.com ([213.175.37.12]) by smtp.gmail.com with ESMTPSA id t66-v6sm5125716wmt.5.2018.11.08.06.31.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Nov 2018 06:31:56 -0800 (PST) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Cc: Sage Weil Subject: [PATCH] libceph: assume argonaut on the server side Date: Thu, 8 Nov 2018 15:31:40 +0100 Message-Id: <20181108143140.12906-1-idryomov@gmail.com> X-Mailer: git-send-email 2.14.4 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP No one is running pre-argonaut. In addition one of the argonaut features (NOSRCADDR) has been required since day one (and a half, v2.6.34 vs v2.6.35) of the kernel client. Allow for the possibility of reusing these feature bits later. Signed-off-by: Ilya Dryomov Reviewed-by: Sage Weil --- fs/ceph/mds_client.c | 12 +++--------- include/linux/ceph/ceph_features.h | 8 +------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index bfba3a040f90..8b3a6f0154f3 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -80,12 +80,8 @@ static int parse_reply_info_in(void **p, void *end, info->symlink = *p; *p += info->symlink_len; - if (features & CEPH_FEATURE_DIRLAYOUTHASH) - ceph_decode_copy_safe(p, end, &info->dir_layout, - sizeof(info->dir_layout), bad); - else - memset(&info->dir_layout, 0, sizeof(info->dir_layout)); - + ceph_decode_copy_safe(p, end, &info->dir_layout, + sizeof(info->dir_layout), bad); ceph_decode_32_safe(p, end, info->xattr_len, bad); ceph_decode_need(p, end, info->xattr_len, bad); info->xattr_data = *p; @@ -3180,10 +3176,8 @@ static void send_mds_reconnect(struct ceph_mds_client *mdsc, recon_state.pagelist = pagelist; if (session->s_con.peer_features & CEPH_FEATURE_MDSENC) recon_state.msg_version = 3; - else if (session->s_con.peer_features & CEPH_FEATURE_FLOCK) - recon_state.msg_version = 2; else - recon_state.msg_version = 1; + recon_state.msg_version = 2; err = iterate_session_caps(session, encode_caps_cb, &recon_state); if (err < 0) goto fail; diff --git a/include/linux/ceph/ceph_features.h b/include/linux/ceph/ceph_features.h index 6b92b3395fa9..65a38c4a02a1 100644 --- a/include/linux/ceph/ceph_features.h +++ b/include/linux/ceph/ceph_features.h @@ -213,12 +213,6 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING | \ CEPH_FEATURE_CEPHX_V2) -#define CEPH_FEATURES_REQUIRED_DEFAULT \ - (CEPH_FEATURE_NOSRCADDR | \ - CEPH_FEATURE_SUBSCRIBE2 | \ - CEPH_FEATURE_RECONNECT_SEQ | \ - CEPH_FEATURE_PGID64 | \ - CEPH_FEATURE_PGPOOL3 | \ - CEPH_FEATURE_OSDENC) +#define CEPH_FEATURES_REQUIRED_DEFAULT 0 #endif