From patchwork Fri Nov 24 05:30:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changwei Ge X-Patchwork-Id: 10073585 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 47C666037F for ; Fri, 24 Nov 2017 05:30:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3205E2A2C9 for ; Fri, 24 Nov 2017 05:30:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 269D72A31C; Fri, 24 Nov 2017 05:30:53 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 724442A2C9 for ; Fri, 24 Nov 2017 05:30:50 +0000 (UTC) Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id vAO5UXvC024425 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 24 Nov 2017 05:30:34 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id vAO5US43004068 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 24 Nov 2017 05:30:29 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1eI6ZI-0008KO-RV; Thu, 23 Nov 2017 21:30:28 -0800 Received: from userv0021.oracle.com ([156.151.31.71]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1eI6ZE-0008KB-Ak for ocfs2-devel@oss.oracle.com; Thu, 23 Nov 2017 21:30:26 -0800 Received: from userp2030.oracle.com (userp2030.oracle.com [156.151.31.89]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id vAO5UNRv003881 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Fri, 24 Nov 2017 05:30:24 GMT Received: from pps.filterd (userp2030.oracle.com [127.0.0.1]) by userp2030.oracle.com (8.16.0.21/8.16.0.21) with SMTP id vAO5Qul0005678; Fri, 24 Nov 2017 05:30:23 GMT Authentication-Results: oracle.com; spf=pass smtp.mailfrom=ge.changwei@h3c.com Received: from h3cmg01-ex.h3c.com (smtp.h3c.com [60.191.123.56]) by userp2030.oracle.com with ESMTP id 2eeagx3he7-1; Fri, 24 Nov 2017 05:30:21 +0000 Received: from BJHUB01-EX.srv.huawei-3com.com (unknown [10.63.20.169]) by h3cmg01-ex.h3c.com with smtp id 267a_0319_2e143bb2_e5f0_424b_8164_eb6e18a4e81f; Fri, 24 Nov 2017 13:30:18 +0800 Received: from H3CMLB14-EX.srv.huawei-3com.com ([fe80::f804:6772:bd71:f07f]) by BJHUB01-EX.srv.huawei-3com.com ([::1]) with mapi id 14.03.0248.002; Fri, 24 Nov 2017 13:30:08 +0800 From: Changwei Ge To: "ocfs2-devel@oss.oracle.com" , Joseph Qi , Mark Fasheh , Joel Becker , Junxiao Bi Thread-Topic: [PATCH] ocfs2/dlm: clean dead code up Thread-Index: AdNk5UkfAa/I8U8xSjygmH7ED468IA== Date: Fri, 24 Nov 2017 05:30:06 +0000 Message-ID: <63ADC13FD55D6546B7DECE290D39E373CED7EF9E@H3CMLB14-EX.srv.huawei-3com.com> Accept-Language: en-US, zh-CN Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.125.136.231] MIME-Version: 1.0 X-CLX-Shades: MLX X-CLX-Response: 1TFkXBx4TEQpZTRdnZnIRCllJFxpxGhAadwYHHhJxGxsQGR93BgcbBhoRCll eF2hueREKSUYXRVhLSUZPdVpYRU5fSV5DRUQZdU9LEQpDThdbG01oQB1dZxh+XE1YGHpJXk9eGx trQGt8YGBAckZ4HhEKWFwXHwQaBBsbEwcbSBpOGE5LTwUbGgQbGhoEHhIEGxAbHhofGhEKXlkXe H58Z2ERCk1cFxgYExEKTFoXaG5CTVMRCk1OF2gRCkxGF2NrEQpDWhccGgQbExsEGxgZBB8cEQpC XhcbEQpEWBcYEQpEXhccEQpESRcbEQpCRhdnE21gG1tlQh9+fREKQlwXGhEKQkUXbhlYTF5hAXB STGERCkJOF2RCfFpFREFiHWRQEQpCTBdvfl1NGAVdZhpSexEKQmwXZGFPS2BCSBJ4HWcRCkJAF2 xSZmxTQkl9Tn1+EQpwaBdpaXNhbUtbQm1iQRAaEQpwaBdgUHJJUwVuTxkFTRAaEQpwaBduf2VoB V9zc3xnZxAaEQpwaBdjE2ZyX3BpbRocGRAaEQpwaBdpTWlQeRxcYBJ+EhAaEQpwbBdtThtvUwFH UkgdcxAHGRoRCm1+FxoRClhNF0sRIA== X-PDR: PASS X-ServerName: smtp.h3c.com X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 ip4:60.191.123.56 ip4:60.191.123.50 ip4:221.12.31.13 ip4:221.12.31.56 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8724 signatures=668623 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=-49 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1711240073 Subject: [Ocfs2-devel] [PATCH] ocfs2/dlm: clean dead code up 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-Source-IP: userv0021.oracle.com [156.151.31.71] X-Virus-Scanned: ClamAV using ClamSMTP This code snippet is no longer used. So trim it, thus to make code neat. Signed-off-by: Changwei Ge Reviewed-by: Alex Chen --- fs/ocfs2/dlm/dlmmaster.c | 7 ------- 1 file changed, 7 deletions(-) (atomic_read(&mle->woken) == 1), diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c index 3e04279446e8..93b61c6c409e 100644 --- a/fs/ocfs2/dlm/dlmmaster.c +++ b/fs/ocfs2/dlm/dlmmaster.c @@ -1122,13 +1122,6 @@ static int dlm_wait_for_lock_mastery(struct dlm_ctxt *dlm, /* sleep if we haven't finished voting yet */ if (sleep) { unsigned long timeo = msecs_to_jiffies(DLM_MASTERY_TIMEOUT_MS); - - /* - if (kref_read(&mle->mle_refs) < 2) - mlog(ML_ERROR, "mle (%p) refs=%d, name=%.*s\n", mle, - kref_read(&mle->mle_refs), - res->lockname.len, res->lockname.name); - */ atomic_set(&mle->woken, 0); (void)wait_event_timeout(mle->wq,