From patchwork Thu Mar 27 18:18:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 3899371 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E68A39F2E8 for ; Thu, 27 Mar 2014 18:19:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 24BC32025B for ; Thu, 27 Mar 2014 18:19:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FFCD20253 for ; Thu, 27 Mar 2014 18:19:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757207AbaC0STo (ORCPT ); Thu, 27 Mar 2014 14:19:44 -0400 Received: from mail-ee0-f45.google.com ([74.125.83.45]:49509 "EHLO mail-ee0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757161AbaC0STl (ORCPT ); Thu, 27 Mar 2014 14:19:41 -0400 Received: by mail-ee0-f45.google.com with SMTP id d17so3225877eek.4 for ; Thu, 27 Mar 2014 11:19:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=3eKrc9MGxwJiVf2MNRY4WL74I0TE1zogDIiL2lauQzU=; b=R7JhT3AlLkmoAawzDxJRJi1c9hzQtQ8CspBO1XyHh8i5jTUlljfmXc98QO6Y+xlJqS QDO5j4Aga2AKVlqzvO8zlB2nDbtTSkR7Jlzs484HuaSDRWPUOB3FuFkynU2tpEcBK0vM AVvxmxjL65dp57YgMbsrgYIUSlQyTzAv9L9h8zuynIKpJaP5mJ15i3AqGuwaES0ZocGw qsHtoSdolWQFRhrT2faeaADBsbMyLPaY2cQuZnEghtw/v9JmKr5lECBxs6u+a0u8cWEV nbw9g5roVn/iKMwZRhyXA+NaeBJBAquzP+jXJMdTA62yXihuPWYZ1q8tgBDjBmc7csvj imOw== X-Gm-Message-State: ALoCoQluVoypLnyGHJBzgQTahHwCPqIE0lN4LJHZK+nyPclW4ievETjO0CtAL9jLRk3koC5VFvG9 X-Received: by 10.14.246.196 with SMTP id q44mr3095627eer.45.1395944380317; Thu, 27 Mar 2014 11:19:40 -0700 (PDT) Received: from localhost ([109.110.66.7]) by mx.google.com with ESMTPSA id t50sm5962930eev.28.2014.03.27.11.19.39 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 27 Mar 2014 11:19:39 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 33/33] libceph: enable PRIMARY_AFFINITY feature bit Date: Thu, 27 Mar 2014 20:18:19 +0200 Message-Id: <1395944299-21970-34-git-send-email-ilya.dryomov@inktank.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395944299-21970-1-git-send-email-ilya.dryomov@inktank.com> References: <1395944299-21970-1-git-send-email-ilya.dryomov@inktank.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Announce our support for osdmaps with non-default primary affinity values. Signed-off-by: Ilya Dryomov Reviewed-by: Alex Elder --- include/linux/ceph/ceph_features.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/ceph/ceph_features.h b/include/linux/ceph/ceph_features.h index 7a4cab50b2cd..d12659ce550d 100644 --- a/include/linux/ceph/ceph_features.h +++ b/include/linux/ceph/ceph_features.h @@ -91,7 +91,8 @@ static inline u64 ceph_sanitize_features(u64 features) CEPH_FEATURE_CRUSH_V2 | \ CEPH_FEATURE_EXPORT_PEER | \ CEPH_FEATURE_OSDMAP_ENC | \ - CEPH_FEATURE_CRUSH_TUNABLES3) + CEPH_FEATURE_CRUSH_TUNABLES3 | \ + CEPH_FEATURE_OSD_PRIMARY_AFFINITY) #define CEPH_FEATURES_REQUIRED_DEFAULT \ (CEPH_FEATURE_NOSRCADDR | \