From patchwork Mon Jun 25 22:51:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 10487489 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6C9E2603B5 for ; Mon, 25 Jun 2018 22:51:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F8D02870D for ; Mon, 25 Jun 2018 22:51:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E23E2871C; Mon, 25 Jun 2018 22:51:04 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 EA2F32870D for ; Mon, 25 Jun 2018 22:51:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754551AbeFYWvD (ORCPT ); Mon, 25 Jun 2018 18:51:03 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:20181 "EHLO esa3.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754278AbeFYWvC (ORCPT ); Mon, 25 Jun 2018 18:51:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1529967062; x=1561503062; h=from:to:cc:subject:date:message-id; bh=fh5+/Vin/LGziCa3QF//OC1OfKHcfY28cGkN64rc+/g=; b=kFmgSWyNJ3Xrt13AIoZ5KzzHD7EVI3UNLzKF187COxQOMfoc/yRuWioy ZDdjUhtqzu2eJlkDdtiQz+BmLFSucKlIOf/RWvkapMlEGcvuopFZVkSaM 1J2/nmptCWR2TYiODrxF2JdRvLAxlC7nZ5H8ST9yQb9ksyTOpCyfQHVcK EimKxEX9SidTcjVEiC1bfPwFYpDp2a4hGUO21CKCrEHTIsW3V51L8CarV CMAnc9F8skPHweSfnuk19KimZjSe2wjlX6Fho73tyWz8WJnl9fHvY9tJt sMnQZ+imV990jxHB81GsLz9esK4Saj0QpqyhNrrDNRm/4r1avEjYhlmte w==; X-IronPort-AV: E=Sophos;i="5.51,272,1526313600"; d="scan'208";a="84342514" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 26 Jun 2018 06:51:02 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP; 25 Jun 2018 15:40:37 -0700 Received: from thinkpad-bart.sdcorp.global.sandisk.com ([10.111.67.248]) by uls-op-cesaip02.wdc.com with ESMTP; 25 Jun 2018 15:51:01 -0700 From: Bart Van Assche To: Jens Axboe Cc: linux-block@vger.kernel.org, Christoph Hellwig , Bart Van Assche , Philipp Reisner , Lars Ellenberg Subject: [PATCH] drbd: Do not redefine __must_hold() Date: Mon, 25 Jun 2018 15:51:00 -0700 Message-Id: <20180625225100.4352-1-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.17.1 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since __must_hold() is defined in , do not redefine it in DRBD. Compile-tested only. Signed-off-by: Bart Van Assche Cc: Philipp Reisner Cc: Lars Ellenberg Reviewed-by: Christoph Hellwig --- drivers/block/drbd/drbd_int.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index b93cbac2cb5a..b9f60030850d 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -55,12 +55,10 @@ # define __protected_by(x) __attribute__((require_context(x,1,999,"rdwr"))) # define __protected_read_by(x) __attribute__((require_context(x,1,999,"read"))) # define __protected_write_by(x) __attribute__((require_context(x,1,999,"write"))) -# define __must_hold(x) __attribute__((context(x,1,1), require_context(x,1,999,"call"))) #else # define __protected_by(x) # define __protected_read_by(x) # define __protected_write_by(x) -# define __must_hold(x) #endif /* shared module parameters, defined in drbd_main.c */