Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp3250015ybl; Mon, 20 Jan 2020 19:39:22 -0800 (PST) X-Google-Smtp-Source: APXvYqyeYNQYgMGvqVt/xredZrJCwUpjQGqZYRxMXGSrF4to9yKYgCWFEA6ODmNAe78vLfHeurRS X-Received: by 2002:a9d:5784:: with SMTP id q4mr2109540oth.278.1579577962630; Mon, 20 Jan 2020 19:39:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579577962; cv=none; d=google.com; s=arc-20160816; b=NTibLijsEXRl5qCpSgI/ICqupz0OvsaC31rGsfdQeG4s3ZkQDzC8zKNpfO6oxm21Z4 j5mRXLR/oaGbWn05eK9STQM/9U9mvUOX7F2PDdjPnUX92PYE82FB5xl913YXcHBdq03o +aGCKHJiN5DhKLy66+vLKPxU5GodOZcsWfferXhKbn7bODdJD1j+3/H+Z5odLWfjBi7e K40BrYPEuSt/BMOLGaHian+MmviD0iB9aAQXiMz2GfPvpdoqsJw/Z9J7vUSe5E8x7YPi VAVYWax0QAwrEe6L+b9435wBnbde2TyCxXMVv1byFyPMS3d8Kr5uV3B4j9vyjOoJJUhQ bGpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:message-id:date:subject:cc:from; bh=HIVmmVX6hIm49zp/aaEWYw9j9yToybZRPpBeX4WKBjY=; b=Vu/P0ZLRFFW1LG/DPyQ2pstsq9dD9gRBtUfj2DwL0zSB2JDKqzfz0B1wXdz7Yzglxx UdjhMYYET5UFnj6vVzEg2iOs/RoyBwgswC3QXloECNWbRlq9lVQSJE3np1h/LbVxaeVU gmqAtF9b1OTHUqLMp8p1b4JXUxeMr92+aOg/tmtUYA7QfjVhBaz/RK+AEOylvtRHrbaO 23azBee1wQxzXMlpFYeQTCQ2f+9agqKX0h6fba53g6WfigbRYy3sEnL06uk9Pf0pxWnm PFZxkMBxcE8T95Qv80NkBG2SrFnE5EAH3Uq7iRG8WDFwL8ptg6RIo7uOQMc8JfcQu1j9 vkgw== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w4si18609134otl.214.2020.01.20.19.39.10; Mon, 20 Jan 2020 19:39:22 -0800 (PST) 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728900AbgAUDhX (ORCPT + 99 others); Mon, 20 Jan 2020 22:37:23 -0500 Received: from out4436.biz.mail.alibaba.com ([47.88.44.36]:19187 "EHLO out4436.biz.mail.alibaba.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728827AbgAUDhW (ORCPT ); Mon, 20 Jan 2020 22:37:22 -0500 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R191e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e07417;MF=alex.shi@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0ToGalXN_1579577829; Received: from localhost(mailfrom:alex.shi@linux.alibaba.com fp:SMTPD_---0ToGalXN_1579577829) by smtp.aliyun-inc.com(127.0.0.1); Tue, 21 Jan 2020 11:37:09 +0800 From: Alex Shi Cc: Mark Fasheh , Joel Becker , Joseph Qi , Andrew Morton , Greg Kroah-Hartman , Kate Stewart , ChenGang , Thomas Gleixner , Richard Fontana , ocfs2-devel@oss.oracle.com, linux-kernel@vger.kernel.org Subject: [PATCH] OCFS2: remove unused macros Date: Tue, 21 Jan 2020 11:37:07 +0800 Message-Id: <1579577827-251796-1-git-send-email-alex.shi@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org O2HB_DEFAULT_BLOCK_BITS/DLM_THREAD_MAX_ASTS/DLM_MIGRATION_RETRY_MS and OCFS2_MAX_RESV_WINDOW_BITS/OCFS2_MIN_RESV_WINDOW_BITS are never used from they were introduced to kernel. so better to remove them. Signed-off-by: Alex Shi Cc: Mark Fasheh Cc: Joel Becker Cc: Joseph Qi Cc: Andrew Morton Cc: Greg Kroah-Hartman Cc: Kate Stewart Cc: ChenGang Cc: Thomas Gleixner Cc: Richard Fontana Cc: ocfs2-devel@oss.oracle.com Cc: linux-kernel@vger.kernel.org --- fs/ocfs2/cluster/heartbeat.c | 2 -- fs/ocfs2/dlm/dlmmaster.c | 2 -- fs/ocfs2/dlm/dlmthread.c | 1 - fs/ocfs2/reservations.c | 3 --- 4 files changed, 8 deletions(-) diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c index a368350d4c27..78cb48d6a596 100644 --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c @@ -101,8 +101,6 @@ struct o2hb_debug_buf { static struct o2hb_callback *hbcall_from_type(enum o2hb_callback_type type); -#define O2HB_DEFAULT_BLOCK_BITS 9 - enum o2hb_heartbeat_modes { O2HB_HEARTBEAT_LOCAL = 0, O2HB_HEARTBEAT_GLOBAL, diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c index 74b768ca1cd8..123b6873d9fa 100644 --- a/fs/ocfs2/dlm/dlmmaster.c +++ b/fs/ocfs2/dlm/dlmmaster.c @@ -2751,8 +2751,6 @@ static int dlm_migrate_lockres(struct dlm_ctxt *dlm, return ret; } -#define DLM_MIGRATION_RETRY_MS 100 - /* * Should be called only after beginning the domain leave process. * There should not be any remaining locks on nonlocal lock resources, diff --git a/fs/ocfs2/dlm/dlmthread.c b/fs/ocfs2/dlm/dlmthread.c index 61c51c268460..2dd9727537fe 100644 --- a/fs/ocfs2/dlm/dlmthread.c +++ b/fs/ocfs2/dlm/dlmthread.c @@ -680,7 +680,6 @@ static void dlm_flush_asts(struct dlm_ctxt *dlm) #define DLM_THREAD_TIMEOUT_MS (4 * 1000) #define DLM_THREAD_MAX_DIRTY 100 -#define DLM_THREAD_MAX_ASTS 10 static int dlm_thread(void *data) { diff --git a/fs/ocfs2/reservations.c b/fs/ocfs2/reservations.c index 0249e8ca1028..bf3842e34fb9 100644 --- a/fs/ocfs2/reservations.c +++ b/fs/ocfs2/reservations.c @@ -33,9 +33,6 @@ static DEFINE_SPINLOCK(resv_lock); -#define OCFS2_MIN_RESV_WINDOW_BITS 8 -#define OCFS2_MAX_RESV_WINDOW_BITS 1024 - int ocfs2_dir_resv_allowed(struct ocfs2_super *osb) { return (osb->osb_resv_level && osb->osb_dir_resv_level); -- 1.8.3.1