From patchwork Thu Feb 27 21:11:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 11410307 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CFAB6138D for ; Thu, 27 Feb 2020 21:34:33 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (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 B862524677 for ; Thu, 27 Feb 2020 21:34:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B862524677 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lustre-devel-bounces@lists.lustre.org Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id C6648349F57; Thu, 27 Feb 2020 13:29:10 -0800 (PST) X-Original-To: lustre-devel@lists.lustre.org Delivered-To: lustre-devel-lustre.org@pdx1-mailman02.dreamhost.com Received: from smtp3.ccs.ornl.gov (smtp3.ccs.ornl.gov [160.91.203.39]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 694E221FCF5 for ; Thu, 27 Feb 2020 13:19:30 -0800 (PST) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp3.ccs.ornl.gov (Postfix) with ESMTP id 1C1AA2C5F; Thu, 27 Feb 2020 16:18:16 -0500 (EST) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 1A67C468; Thu, 27 Feb 2020 16:18:16 -0500 (EST) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Thu, 27 Feb 2020 16:11:45 -0500 Message-Id: <1582838290-17243-238-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1582838290-17243-1-git-send-email-jsimmons@infradead.org> References: <1582838290-17243-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 237/622] lustre: ptlrpc: Change static defines to use macro for sec_gc.c X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arshad Hussain , Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: Arshad Hussain This patch replaces all mutex, locks, and wait qeueues which are defined statically in file fs/lustre/ptlrpc/sec_gc.c with kernel provided macro. WC-bug-id: https://jira.whamcloud.com/browse/LU-9010 Lustre-commit: 50c01e02506f ("LU-9010 ptlrpc: Change static defines to use macro for sec_gc.c") Signed-off-by: Arshad Hussain Reviewed-on: https://review.whamcloud.com/33937 Reviewed-by: Ben Evans Reviewed-by: Sebastien Buisson Reviewed-by: James Simmons Reviewed-by: Oleg Drokin Signed-off-by: James Simmons --- fs/lustre/ptlrpc/sec_gc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fs/lustre/ptlrpc/sec_gc.c b/fs/lustre/ptlrpc/sec_gc.c index d5edcec..3baed8c 100644 --- a/fs/lustre/ptlrpc/sec_gc.c +++ b/fs/lustre/ptlrpc/sec_gc.c @@ -48,12 +48,12 @@ #define SEC_GC_INTERVAL (30 * 60) -static struct mutex sec_gc_mutex; +static DEFINE_MUTEX(sec_gc_mutex); static LIST_HEAD(sec_gc_list); -static spinlock_t sec_gc_list_lock; +static DEFINE_SPINLOCK(sec_gc_list_lock); static LIST_HEAD(sec_gc_ctx_list); -static spinlock_t sec_gc_ctx_list_lock; +static DEFINE_SPINLOCK(sec_gc_ctx_list_lock); static atomic_t sec_gc_wait_del = ATOMIC_INIT(0); @@ -176,10 +176,6 @@ static void sec_gc_main(struct work_struct *ws) int sptlrpc_gc_init(void) { - mutex_init(&sec_gc_mutex); - spin_lock_init(&sec_gc_list_lock); - spin_lock_init(&sec_gc_ctx_list_lock); - schedule_delayed_work(&sec_gc_work, 0); return 0; }