Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2279528imm; Thu, 7 Jun 2018 08:07:13 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL2+bHRf0YBKnHwss01W5E35O0n4fvn4pzXlAWnPb6yxEgYzULQEkRP2aHS01PeYyUNC+Be X-Received: by 2002:a63:6c49:: with SMTP id h70-v6mr1927212pgc.34.1528384033567; Thu, 07 Jun 2018 08:07:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528384033; cv=none; d=google.com; s=arc-20160816; b=tnTeOQQ4+bhP13HPUaxfZ82TCZApw+B4QqOTlx0sSJRJWxfdobySuDaenNfwnUam59 +D7YNx69g6/McWZFiv4xqzqDtAZ7jsbLkCj98chpGNS8vvxOKRT88OHVCavFgJl+jxVV 8EIIUYegBbaHCW6ot16wQPs5rcj6lMr9p29N0BVEsWNc8Ss9+oeJHj4a/A9dAYmmCGDI SA3574rZIH3bxPSiXf/vuw6iD1tHe6wArluVDCOlZ4fgp8X7v4Nhd+l7pCw5Nkj28FU4 qcmcRuMrDY4KfQpQIsU3XS9BsX8+yXw3iBbi0k26BMl3mc0Q4kCxHCZkUx4RnDGKcCfZ d9Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition :arc-authentication-results; bh=lBm3GFFnOnS0kNSRVj24Mw3t0aO12s7LBTWUP66W8+c=; b=JogrBiMvimwTOurqvhWNmJdCy/9X6/qSlb8FZHRybvBpblhJ4nvX9bFCBkS2EFDw+v XKl1qjlgOvwto+nBY1+pUorFO8JP4Ov+ts4oBQW3TCy8IJoLiyeRT38kunH1atBO0lal qn1bL3QnHnG4XvexkbSfhpb9UjtBg1Ud1LIGQYMyh0LCno0oYO6ahJ9YwBZeVP8y1VgX UqE79Xg1Tx5EnGqCTaqsZI5h6dgwQWbLauEF2eFrTTCHDmF2pi6b50FrsbuB3FIqj1Ae sU3RhMmh1Xph2xtJu52lFGP9141h7YGQs7BNputAaNndfc7boRJpSuoW9LFvpNJ/++oY z1Yg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o2-v6si12057919pfh.327.2018.06.07.08.06.58; Thu, 07 Jun 2018 08:07:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936024AbeFGPED (ORCPT + 99 others); Thu, 7 Jun 2018 11:04:03 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:41554 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936013AbeFGPEA (ORCPT ); Thu, 7 Jun 2018 11:04:00 -0400 Received: from [148.252.241.226] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1fQvbk-0005hL-4B; Thu, 07 Jun 2018 15:09:44 +0100 Received: from ben by deadeye with local (Exim 4.91) (envelope-from ) id 1fQvb4-0002xb-OW; Thu, 07 Jun 2018 15:09:02 +0100 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Jason Dillaman" , "Ilya Dryomov" Date: Thu, 07 Jun 2018 15:05:21 +0100 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 177/410] rbd: whitelist RBD_FEATURE_OPERATIONS feature bit In-Reply-To: X-SA-Exim-Connect-IP: 148.252.241.226 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.57-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Ilya Dryomov commit e573427a440fd67d3f522357d7ac901d59281948 upstream. This feature bit restricts older clients from performing certain maintenance operations against an image (e.g. clone, snap create). krbd does not perform maintenance operations. Signed-off-by: Ilya Dryomov Reviewed-by: Jason Dillaman [bwh: Backported to 3.16: adjust context] Signed-off-by: Ben Hutchings --- --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -117,8 +117,11 @@ static int atomic_dec_return_safe(atomic #define RBD_FEATURE_LAYERING (1<<0) #define RBD_FEATURE_STRIPINGV2 (1<<1) -#define RBD_FEATURES_ALL \ - (RBD_FEATURE_LAYERING | RBD_FEATURE_STRIPINGV2) +#define RBD_FEATURE_OPERATIONS (1<<8) + +#define RBD_FEATURES_ALL (RBD_FEATURE_LAYERING | \ + RBD_FEATURE_STRIPINGV2 | \ + RBD_FEATURE_OPERATIONS) /* Features supported by this (client software) implementation. */