From patchwork Tue Jan 19 08:18:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: guozh X-Patchwork-Id: 12030777 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 015A0C433DB for ; Tue, 19 Jan 2021 20:46:27 +0000 (UTC) Received: from userp2130.oracle.com (userp2130.oracle.com [156.151.31.86]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A7C2523107; Tue, 19 Jan 2021 20:46:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7C2523107 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=chinatelecom.cn Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=ocfs2-devel-bounces@oss.oracle.com Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 10JHnv2q096274; Tue, 19 Jan 2021 17:54:29 GMT Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2130.oracle.com with ESMTP id 363xyhsp0u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Jan 2021 17:54:29 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 10JHobvf172893; Tue, 19 Jan 2021 17:54:29 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by userp3020.oracle.com with ESMTP id 3661khk66u-1 (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO); Tue, 19 Jan 2021 17:54:29 +0000 Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1l1v9z-0007p1-3J; Tue, 19 Jan 2021 09:51:19 -0800 Received: from aserp3030.oracle.com ([141.146.126.71]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1l1mFx-00030W-0w for ocfs2-devel@oss.oracle.com; Tue, 19 Jan 2021 00:20:53 -0800 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 10J8KpaI149315 for ; Tue, 19 Jan 2021 08:20:52 GMT Received: from userp2030.oracle.com (userp2030.oracle.com [156.151.31.89]) by aserp3030.oracle.com with ESMTP id 3649qntbm6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 19 Jan 2021 08:20:52 +0000 Received: from pps.filterd (userp2030.oracle.com [127.0.0.1]) by userp2030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 10J8F9pX020278 for ; Tue, 19 Jan 2021 08:20:33 GMT Received: from chinatelecom.cn (prt-mail.chinatelecom.cn [42.123.76.227]) by userp2030.oracle.com with ESMTP id 365rn4t926-1 for ; Tue, 19 Jan 2021 08:20:30 +0000 HMM_SOURCE_IP: 172.18.0.92:60425.1119872845 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP Received: from clientip-106.120.220.78?logid-41fe43b94e2b41418182f2b6b23cc585 (unknown [172.18.0.92]) by chinatelecom.cn (HERMES) with SMTP id F22C42800D1; Tue, 19 Jan 2021 16:18:43 +0800 (CST) X-189-SAVE-TO-SEND: 71117184@chinatelecom.cn Received: from ([172.18.0.92]) by App0021 with ESMTP id 41fe43b94e2b41418182f2b6b23cc585 for akpm@linux-foundation.org; Tue Jan 19 16:18:51 2021 X-Transaction-ID: 41fe43b94e2b41418182f2b6b23cc585 X-filter-score: filter<0> X-Real-From: guozh88@chinatelecom.cn X-Receive-IP: 172.18.0.92 X-MEDUSA-Status: 0 Date: Tue, 19 Jan 2021 16:18:23 +0800 From: guozh To: akpm , joseph.qi , ocfs2-devel X-Priority: 3 X-Has-Attach: no X-Mailer: Foxmail 7.2.18.95[cn] Mime-Version: 1.0 Message-ID: <2021011916182284700534@chinatelecom.cn> X-PDR: PASS X-Source-IP: 42.123.76.227 X-ServerName: prt-mail.chinatelecom.cn X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 ip4:42.123.76.201/22 -all X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9868 signatures=668683 X-Proofpoint-Spam-Details: rule=tap_notspam policy=tap score=0 bulkscore=0 phishscore=0 lowpriorityscore=0 adultscore=0 priorityscore=30 spamscore=0 malwarescore=0 impostorscore=0 clxscore=297 mlxlogscore=656 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2101190049 X-Spam: Clean X-Mailman-Approved-At: Tue, 19 Jan 2021 09:51:17 -0800 Subject: [Ocfs2-devel] [PATCH] ocfs2: cleanup some definitions which is not used anymore. X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9869 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 malwarescore=0 phishscore=0 mlxscore=0 adultscore=0 spamscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2101190101 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9869 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 priorityscore=1501 spamscore=0 mlxscore=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 clxscore=1034 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2101190101 There are some definitions which is not used anymore in OCFS2 module, so as to be removed. Signed-off-by: Guozhonghua Acked-by: Joseph Qi ---  fs/ocfs2/dlm/dlmast.c    | 10 ----------  fs/ocfs2/dlm/dlmcommon.h |  4 ----  2 files changed, 14 deletions(-) --  2.18.4 diff --git a/fs/ocfs2/dlm/dlmast.c b/fs/ocfs2/dlm/dlmast.c index 6abaded3ff6b..70a10764f249 100644 --- a/fs/ocfs2/dlm/dlmast.c +++ b/fs/ocfs2/dlm/dlmast.c @@ -165,16 +165,6 @@ void __dlm_queue_bast(struct dlm_ctxt *dlm, struct dlm_lock *lock)   spin_unlock(&lock->spinlock);  }   -void dlm_queue_bast(struct dlm_ctxt *dlm, struct dlm_lock *lock) -{ - BUG_ON(!dlm); - BUG_ON(!lock); - - spin_lock(&dlm->ast_lock); - __dlm_queue_bast(dlm, lock); - spin_unlock(&dlm->ast_lock); -} -  static void dlm_update_lvb(struct dlm_ctxt *dlm, struct dlm_lock_resource *res,     struct dlm_lock *lock)  { diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h index c8a444622faa..58d57e25d384 100644 --- a/fs/ocfs2/dlm/dlmcommon.h +++ b/fs/ocfs2/dlm/dlmcommon.h @@ -17,10 +17,7 @@    #define DLM_LOCKID_NAME_MAX    32   -#define DLM_DOMAIN_NAME_MAX_LEN    255  #define DLM_LOCK_RES_OWNER_UNKNOWN     O2NM_MAX_NODES -#define DLM_THREAD_SHUFFLE_INTERVAL    5     // flush everything every 5 passes -#define DLM_THREAD_MS                  200   // flush at least every 200 ms    #define DLM_HASH_SIZE_DEFAULT (1 << 17)  #if DLM_HASH_SIZE_DEFAULT < PAGE_SIZE @@ -902,7 +899,6 @@ void __dlm_lockres_grab_inflight_worker(struct dlm_ctxt *dlm,   struct dlm_lock_resource *res);    void dlm_queue_ast(struct dlm_ctxt *dlm, struct dlm_lock *lock); -void dlm_queue_bast(struct dlm_ctxt *dlm, struct dlm_lock *lock);  void __dlm_queue_ast(struct dlm_ctxt *dlm, struct dlm_lock *lock);  void __dlm_queue_bast(struct dlm_ctxt *dlm, struct dlm_lock *lock);  void dlm_do_local_ast(struct dlm_ctxt *dlm,