Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp220629iob; Mon, 2 May 2022 17:37:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCCBow3B7qsQna+iE9kMQHS0pyKSbf749l4UpxU/5oTxSgLIzt7/7aK/XznUqVzir27/vi X-Received: by 2002:a63:6ac9:0:b0:3bc:321e:6d56 with SMTP id f192-20020a636ac9000000b003bc321e6d56mr11806800pgc.490.1651538222355; Mon, 02 May 2022 17:37:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651538222; cv=none; d=google.com; s=arc-20160816; b=p36lPPEWJCV1ZehHQj+4qUvcu3S3orDx6aPDN/8OAAgItN2Q/hItrGsRyE+2SH0Ih0 OQPljeZNyOLFT85uQrO9LUYN6AnFA3Y/hYKfj20lxmqnq/LdBJB9KnADHURNupqFXGMJ YznaD45SrruWHBC+g1Qg2zAZShYU1vpdMfQ7JZKyLIpthTB9Yge9K+WSdgms+ZpxMRZ/ CbjJy9oFTRQzjG27qK0I41pFdtDhrEDKQzyHPRCv0hu6t/kS3AKIEZ/ZlffbsvzuQLkq +UGUFh+HNJcW97cdhsAxUF9PGdLcHZqfhHj5HTBo3hbo1iSNzysHyQWBUT0yzjKL5tUm w2cg== 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=toU4fmLEGnLMxMPEFtGpmqPvow+Zmy8XWz0dgtOyOPA=; b=Uwm8ApVXneuCalODH9eYCB5c37kODqOF0yPdgMlJ27x81CzE1RSsXPv5GKVOl1EEg+ zdmbzVBp84WKKY8EpKe8yfI4m2/a4c3ySY4Waq5q9IrVvZN2bAmnSmjQo+K7Y0n46uCv HTEWa+fHSQRRJdFuWzK+XhIEjuP3xXebrDZOYNloHEiAA0WgFVUQ7dNmoJjttwYQdyfW 2uti5kOI2u64KmmJHWMo/NMwUUZ1810nwWlGoBRQDJ3gWzEXOxD7vVxqTzPyMFkps92b n7MBmin8WzHDPDWbndpi9yfm5cfnI94qW+/QF7iOJAfwukfHtHB5dBWaD/Bluox3YPu4 eU1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2021-07-09 header.b="jUHiJFR/"; spf=softfail (google.com: domain of transitioning linux-nfs-owner@vger.kernel.org does not designate 23.128.96.19 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. [23.128.96.19]) by mx.google.com with ESMTPS id y5-20020aa78f25000000b004fa3a8dff9dsi14617059pfr.84.2022.05.02.17.37.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 17:37:02 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-nfs-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2021-07-09 header.b="jUHiJFR/"; spf=softfail (google.com: domain of transitioning linux-nfs-owner@vger.kernel.org does not designate 23.128.96.19 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 33BAA37BE0; Mon, 2 May 2022 17:28:51 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1387621AbiEBVXQ (ORCPT + 99 others); Mon, 2 May 2022 17:23:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1387609AbiEBVXL (ORCPT ); Mon, 2 May 2022 17:23:11 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95A35DFD7; Mon, 2 May 2022 14:19:41 -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 242IT5dv030007; Mon, 2 May 2022 21:19:36 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=toU4fmLEGnLMxMPEFtGpmqPvow+Zmy8XWz0dgtOyOPA=; b=jUHiJFR/I6FNXGfBVeHtUYWVHtUwTTavyZ4JS+wtdkmVpKT8oPYC9fIWhM8QyMtAIkK2 vAuYvbsRNB5x6oE5GJnDn7r0FCX7Q4EV9q05zDNWMM/DMTKgGbgh7dpUKkgXAul5NtdC TYoKMLL4v/8PREUK5FtswKm2SBorvDlQ+EK65g1Dz87VYoTanRU40gL5O061OwUpBFh+ gdyOpOXmv5TJ5+HvTRKcE2+n1fqz59+4FQ/+Zn4gFJOwP8nvCkMl1v8YrvTChqcHJCSV 3QuKcVwBuv9TBkB2yeP/F+npK7uZNza24bcfndon7k2ihMKEHgwd/YV4vD0wLz3s2EPi EQ== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3fruq0cdv0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 02 May 2022 21:19:36 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 242LAksr029078; Mon, 2 May 2022 21:19:35 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3fruj1v8q9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 02 May 2022 21:19:35 +0000 Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 242LJXSO003941; Mon, 2 May 2022 21:19:35 GMT Received: from ca-common-hq.us.oracle.com (ca-common-hq.us.oracle.com [10.211.9.209]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3fruj1v8ph-5; Mon, 02 May 2022 21:19:35 +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 v25 4/7] fs/lock: add helper locks_owner_has_blockers to check for blockers Date: Mon, 2 May 2022 14:19:24 -0700 Message-Id: <1651526367-1522-5-git-send-email-dai.ngo@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1651526367-1522-1-git-send-email-dai.ngo@oracle.com> References: <1651526367-1522-1-git-send-email-dai.ngo@oracle.com> X-Proofpoint-ORIG-GUID: l7I9qAD5b9ctXbx_-m6m4Qvaz321njYu X-Proofpoint-GUID: l7I9qAD5b9ctXbx_-m6m4Qvaz321njYu 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. Reviewed-by: J. Bruce Fields 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