From: Pavel Reichl <preichl@redhat.com>
To: linux-xfs@vger.kernel.org
Cc: Pavel Reichl <preichl@redhat.com>, Dave Chinner <dchinner@redhat.com>
Subject: [PATCH v2 1/7] xfs: Add xfs_is_{i,io,mmap}locked functions
Date: Mon, 3 Feb 2020 18:58:44 +0100 [thread overview]
Message-ID: <20200203175850.171689-2-preichl@redhat.com> (raw)
In-Reply-To: <20200203175850.171689-1-preichl@redhat.com>
Add xfs_is_ilocked(), xfs_is_iolocked() and xfs_is_mmaplocked()
Signed-off-by: Pavel Reichl <preichl@redhat.com>
Suggested-by: Dave Chinner <dchinner@redhat.com>
---
fs/xfs/xfs_inode.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++
fs/xfs/xfs_inode.h | 3 +++
2 files changed, 56 insertions(+)
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index c5077e6326c7..80874c80df6d 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -372,6 +372,59 @@ xfs_isilocked(
ASSERT(0);
return 0;
}
+
+static inline bool
+__xfs_is_ilocked(
+ struct rw_semaphore *rwsem,
+ bool shared,
+ bool excl)
+{
+ bool locked = false;
+
+ if (!rwsem_is_locked(rwsem))
+ return false;
+
+ if (!debug_locks)
+ return true;
+
+ if (shared)
+ locked = lockdep_is_held_type(rwsem, 0);
+
+ if (excl)
+ locked |= lockdep_is_held_type(rwsem, 1);
+
+ return locked;
+}
+
+bool
+xfs_is_ilocked(
+ struct xfs_inode *ip,
+ int lock_flags)
+{
+ return __xfs_is_ilocked(&ip->i_lock.mr_lock,
+ (lock_flags & XFS_ILOCK_SHARED),
+ (lock_flags & XFS_ILOCK_EXCL));
+}
+
+bool
+xfs_is_mmaplocked(
+ struct xfs_inode *ip,
+ int lock_flags)
+{
+ return __xfs_is_ilocked(&ip->i_mmaplock.mr_lock,
+ (lock_flags & XFS_MMAPLOCK_SHARED),
+ (lock_flags & XFS_MMAPLOCK_EXCL));
+}
+
+bool
+xfs_is_iolocked(
+ struct xfs_inode *ip,
+ int lock_flags)
+{
+ return __xfs_is_ilocked(&VFS_I(ip)->i_rwsem,
+ (lock_flags & XFS_IOLOCK_SHARED),
+ (lock_flags & XFS_IOLOCK_EXCL));
+}
#endif
/*
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 492e53992fa9..6ba575f35c1f 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -417,6 +417,9 @@ int xfs_ilock_nowait(xfs_inode_t *, uint);
void xfs_iunlock(xfs_inode_t *, uint);
void xfs_ilock_demote(xfs_inode_t *, uint);
int xfs_isilocked(xfs_inode_t *, uint);
+bool xfs_is_ilocked(struct xfs_inode *, int);
+bool xfs_is_mmaplocked(struct xfs_inode *, int);
+bool xfs_is_iolocked(struct xfs_inode *, int);
uint xfs_ilock_data_map_shared(struct xfs_inode *);
uint xfs_ilock_attr_map_shared(struct xfs_inode *);
--
2.24.1
next prev parent reply other threads:[~2020-02-03 17:59 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-03 17:58 [PATCH v2 0/7] xfs: Remove wrappers for some semaphores Pavel Reichl
2020-02-03 17:58 ` Pavel Reichl [this message]
2020-02-03 21:00 ` [PATCH v2 1/7] xfs: Add xfs_is_{i,io,mmap}locked functions Chaitanya Kulkarni
2020-02-03 23:15 ` Dave Chinner
2020-02-03 23:45 ` Eric Sandeen
2020-02-04 6:19 ` Christoph Hellwig
2020-02-03 17:58 ` [PATCH v2 2/7] xfs: Update checking excl. locks for ilock Pavel Reichl
2020-02-03 23:16 ` Dave Chinner
2020-02-04 6:21 ` Christoph Hellwig
2020-02-04 16:08 ` Eric Sandeen
2020-02-04 21:06 ` Dave Chinner
2020-02-04 22:20 ` Eric Sandeen
2020-02-03 17:58 ` [PATCH v2 3/7] xfs: Update checking read or write " Pavel Reichl
2020-02-03 23:18 ` Dave Chinner
2020-02-03 17:58 ` [PATCH v2 4/7] xfs: Update checking for iolock Pavel Reichl
2020-02-03 23:24 ` Dave Chinner
2020-02-03 17:58 ` [PATCH v2 5/7] xfs: Update checking for mmaplock Pavel Reichl
2020-02-03 23:25 ` Dave Chinner
2020-02-03 17:58 ` [PATCH v2 6/7] xfs: update excl. lock check for IOLOCK and ILOCK Pavel Reichl
2020-02-03 23:35 ` Dave Chinner
2020-02-03 17:58 ` [PATCH v2 7/7] xfs: Replace mrlock_t by rw_semaphore Pavel Reichl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200203175850.171689-2-preichl@redhat.com \
--to=preichl@redhat.com \
--cc=dchinner@redhat.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).