Received: by 10.213.65.68 with SMTP id h4csp1125684imn; Wed, 28 Mar 2018 21:28:43 -0700 (PDT) X-Google-Smtp-Source: AIpwx48IP+0At+gQZwXzOB+wnWAk0fF9VOIyzvWj93RxlirHUuqGFjCpTBRurjMzx5ex64sIOCoS X-Received: by 2002:a17:902:6b8b:: with SMTP id p11-v6mr6643738plk.213.1522297723634; Wed, 28 Mar 2018 21:28:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522297723; cv=none; d=google.com; s=arc-20160816; b=gMgJjIyE7qM/s+l6Z3kyS27cG43qToSfPdNCLCZE2lLjTBhYtDOQ2rhxhDgdy85M4K klm485i+WX7Q1isUlUKoCTPtzA3gGZhEh1X9LmDxD+dJAH5tEuJ9/yM0j0oVTuMu805H I4ZIr/9xjlCmhbdWzs7x75OOPT16WDf2TAD69A1b9K8i8sceGI3uGSbzOGFcppYwquD1 lYi+s+qXbATcq8ijxN47fW9D2iMTL3+1fhyfa/RXmg5aMZrFIZw0BuXCECqgiw4x4Lp3 P/J+UJKPz3aszJ3zp9IQ5IAhy75cDTC8IIDmOi4g1wjzyTekqAyH6KjjfrXrREega0dp J2Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:cc:subject:date:to :from:arc-authentication-results; bh=XknVV4H+uBJ/TVSllaBdukppiSVz9ruwj0iR51eTNyU=; b=I7WtAR532Magtn0QfKF0sTG5FvleWg4SCTpVh9KFpHaBSRkGgtttGLlj8RzK6QuZmp UDOYdeIqojbvcr6hk/drwhDI+uhiQOucN2jytmF/vmhXhx6ReV645ewcX5DmBJ/SrxoK Uz9Za20fpv7RS/jUWqRWPo1Em0hG0eRHO3CpAbdUGjwa3U4p/5kvZc9Pq0iui+8Ah5ua /sJDkKzKDXdmCJk5pQxzL1/oYIXN2UziImPBNJf4b16G7w+PyjpTws8dr4BSM5gG+C7v yxotji7jFFatvDmSaPiXvmoMeJrqDr7s8RDTStbDzJGiNdi6CbdlqIIsLXeHIvIP7rAQ zoKg== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u7-v6si5047595plz.562.2018.03.28.21.28.29; Wed, 28 Mar 2018 21:28:43 -0700 (PDT) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752199AbeC2E10 (ORCPT + 99 others); Thu, 29 Mar 2018 00:27:26 -0400 Received: from mx2.suse.de ([195.135.220.15]:34703 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752159AbeC2E1Y (ORCPT ); Thu, 29 Mar 2018 00:27:24 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 93BAEAFA8; Thu, 29 Mar 2018 04:27:23 +0000 (UTC) From: NeilBrown To: Oleg Drokin , Greg Kroah-Hartman , James Simmons , Andreas Dilger Date: Thu, 29 Mar 2018 15:26:48 +1100 Subject: [PATCH 02/17] staging: lustre: remove unused ldlm_completion_ast_async() Cc: Linux Kernel Mailing List , Lustre Development List Message-ID: <152229760829.27689.12680083968318847851.stgit@noble> In-Reply-To: <152229732768.27689.4800156943561963977.stgit@noble> References: <152229732768.27689.4800156943561963977.stgit@noble> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This function is unused. Signed-off-by: NeilBrown --- drivers/staging/lustre/lustre/include/lustre_dlm.h | 1 - drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 23 -------------------- 2 files changed, 24 deletions(-) diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h index 239aa2b1268f..7407acf60cf8 100644 --- a/drivers/staging/lustre/lustre/include/lustre_dlm.h +++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h @@ -1227,7 +1227,6 @@ int ldlm_lock_change_resource(struct ldlm_namespace *, struct ldlm_lock *, * processing. * @{ */ -int ldlm_completion_ast_async(struct ldlm_lock *lock, __u64 flags, void *data); int ldlm_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data); /** @} ldlm_local_ast */ diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c index c3c9186b74ce..be43958e4090 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c @@ -191,29 +191,6 @@ static int ldlm_completion_tail(struct ldlm_lock *lock, void *data) return result; } -/** - * Implementation of ->l_completion_ast() for a client, that doesn't wait - * until lock is granted. Suitable for locks enqueued through ptlrpcd, of - * other threads that cannot block for long. - */ -int ldlm_completion_ast_async(struct ldlm_lock *lock, __u64 flags, void *data) -{ - if (flags == LDLM_FL_WAIT_NOREPROC) { - LDLM_DEBUG(lock, "client-side enqueue waiting on pending lock"); - return 0; - } - - if (!(flags & LDLM_FL_BLOCKED_MASK)) { - wake_up(&lock->l_waitq); - return ldlm_completion_tail(lock, data); - } - - LDLM_DEBUG(lock, - "client-side enqueue returned a blocked lock, going forward"); - return 0; -} -EXPORT_SYMBOL(ldlm_completion_ast_async); - /** * Generic LDLM "completion" AST. This is called in several cases: *