Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp209243iob; Mon, 2 May 2022 17:16:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8vGveHVwHiEZBmPsSZHEseMmloXBKg7q+akDK/jgt0kmAWyuHN1kpCDSZadRp6RG0zMDl X-Received: by 2002:a17:902:6b87:b0:158:a0d9:9bd with SMTP id p7-20020a1709026b8700b00158a0d909bdmr14108075plk.156.1651536997320; Mon, 02 May 2022 17:16:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651536997; cv=none; d=google.com; s=arc-20160816; b=f59KbusPAlBHnKXZ0e2Lvvw3SAMk4FlQGwXnvUN2QVBTV1Z0dsAkGcIUI+Jdv3e8N8 0hkp3INJmOD4b8KpVkk/FPHOJ5mMOsUuUALFrjjAjuUuZ/8qZryZ3SRDdACEGjF5KUlw a5j31y5EiX9CisYAL2bv7xKoLBZ9rL8qMRXy7JPfPuDM+8YiQNW/cAL9GVDE9gO5i5/Q Z8a1wpBnhnzPDBdRNOFpS4svFWkq0CH6n7jwdzwmP7FqQT1NQoVCt/yjvjhioVJasJcp VSXth7Un5V4f1pif4wZT2qa45w2fx8ST/IuFHs56rt6BeSYunelvr04NWop3vzQPh6Oi cHKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=8wxROLCFf21i4G1MDpwgdE5up1VD2tI4Hd2iZWeERLk=; b=mtE/Q7lQ+BSQOxbJgi0/ExMtoQXhmTK3+cceQCOquvPvddoMubWOpUMwCX87q5pzdY lQ1GlXjxeTEo7sCv6IJxTqRuhBzh37oLbIPWYwa1/92/OcmJ0aIRzxklZUL28cVRGw3B bgtrVyUYyYKBTF/ItKU/nUrjLijLBUl5hPE2EMAblN5rPtXh8vccio+CeEsyGvM83XaL WNYfGOeCbHOKeaQZTLeHmBnvGjUJIDOdQaqaxzQhkQm6e8wIiF6PC0/3OXYjPhp3bn2e VTeVmZY8qxiO/bW9rLMh7dXDIVUe6tOngHjcEg7ddKYJKZ49bT0QJubP01DrIv3C7Cp4 Z8iA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2021-07-09 header.b="WKvgn/Tz"; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id s30-20020a056a00179e00b0050a707536ecsi16992828pfg.299.2022.05.02.17.16.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 17:16:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2021-07-09 header.b="WKvgn/Tz"; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 44C333633A; Mon, 2 May 2022 17:14:43 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353501AbiEARlw (ORCPT + 99 others); Sun, 1 May 2022 13:41:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353456AbiEARlu (ORCPT ); Sun, 1 May 2022 13:41:50 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B23913F92; Sun, 1 May 2022 10:38:25 -0700 (PDT) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2419ifKP030007; Sun, 1 May 2022 17:38:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2021-07-09; bh=8wxROLCFf21i4G1MDpwgdE5up1VD2tI4Hd2iZWeERLk=; b=WKvgn/Tzwp4ftQ1ACi/7YnB3sPA3wTPQcI0g/u6hnc9IosM3vQFpj3lPCDazHbnwjl9E oXJc5c6WZeUuiqDWGc8pduXYzAbMOzflqLWN6aLyLdI5yPA9s5BvbyOUrkOaP9lTD0Vd FHFTNhbi5vTeJdFySJzUfwKIIWkGPfRkIORk/W6Uk3JOdbQN04uCgtgxjrImqyobrBbt jSGHWjSvSN43c+3WfxoNRVMVfRvFcLDRD3gztCmJyXZ3q/ZbPSuVpq8khhLny8wMSati yz79kqc6gMeCrdfiSKjOMUxkPbytKUVrVoOzJbxlJP3OoOfh3gqf6YfwZ36gIQQcJp4s 5w== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3fruq09v5r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 01 May 2022 17:38:22 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 241HZNtl033506; Sun, 1 May 2022 17:38:22 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3fs1a37w6f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 01 May 2022 17:38:22 +0000 Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 241HauVh034841; Sun, 1 May 2022 17:38:21 GMT Received: from ca-common-hq.us.oracle.com (ca-common-hq.us.oracle.com [10.211.9.209]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3fs1a37w5x-5; Sun, 01 May 2022 17:38:21 +0000 From: Dai Ngo To: chuck.lever@oracle.com, bfields@fieldses.org Cc: jlayton@redhat.com, viro@zeniv.linux.org.uk, linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH RFC v24 4/7] fs/lock: add helper locks_owner_has_blockers to check for blockers Date: Sun, 1 May 2022 10:38:13 -0700 Message-Id: <1651426696-15509-5-git-send-email-dai.ngo@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1651426696-15509-1-git-send-email-dai.ngo@oracle.com> References: <1651426696-15509-1-git-send-email-dai.ngo@oracle.com> X-Proofpoint-ORIG-GUID: OVshhh3DsGZhkjKRaH5yyWx_4Mr78UQM X-Proofpoint-GUID: OVshhh3DsGZhkjKRaH5yyWx_4Mr78UQM X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Add helper locks_owner_has_blockers to check if there is any blockers for a given lockowner. Signed-off-by: Dai Ngo --- fs/locks.c | 28 ++++++++++++++++++++++++++++ include/linux/fs.h | 7 +++++++ 2 files changed, 35 insertions(+) diff --git a/fs/locks.c b/fs/locks.c index 8c6df10cd9ed..c369841ef7d1 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -300,6 +300,34 @@ void locks_release_private(struct file_lock *fl) } EXPORT_SYMBOL_GPL(locks_release_private); +/** + * locks_owner_has_blockers - Check for blocking lock requests + * @flctx: file lock context + * @owner: lock owner + * + * Return values: + * %true: @owner has at least one blocker + * %false: @owner has no blockers + */ +bool locks_owner_has_blockers(struct file_lock_context *flctx, + fl_owner_t owner) +{ + struct file_lock *fl; + + spin_lock(&flctx->flc_lock); + list_for_each_entry(fl, &flctx->flc_posix, fl_list) { + if (fl->fl_owner != owner) + continue; + if (!list_empty(&fl->fl_blocked_requests)) { + spin_unlock(&flctx->flc_lock); + return true; + } + } + spin_unlock(&flctx->flc_lock); + return false; +} +EXPORT_SYMBOL_GPL(locks_owner_has_blockers); + /* Free a lock which is not in use. */ void locks_free_lock(struct file_lock *fl) { diff --git a/include/linux/fs.h b/include/linux/fs.h index bbde95387a23..b8ed7f974fb4 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1174,6 +1174,8 @@ extern void lease_unregister_notifier(struct notifier_block *); struct files_struct; extern void show_fd_locks(struct seq_file *f, struct file *filp, struct files_struct *files); +extern bool locks_owner_has_blockers(struct file_lock_context *flctx, + fl_owner_t owner); #else /* !CONFIG_FILE_LOCKING */ static inline int fcntl_getlk(struct file *file, unsigned int cmd, struct flock __user *user) @@ -1309,6 +1311,11 @@ static inline int lease_modify(struct file_lock *fl, int arg, struct files_struct; static inline void show_fd_locks(struct seq_file *f, struct file *filp, struct files_struct *files) {} +static inline bool locks_owner_has_blockers(struct file_lock_context *flctx, + fl_owner_t owner) +{ + return false; +} #endif /* !CONFIG_FILE_LOCKING */ static inline struct inode *file_inode(const struct file *f) -- 2.9.5