From: Pavel Reichl <preichl@redhat.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v5 3/4] xfs: xfs_isilocked() can only check a single lock type
Date: Fri, 14 Feb 2020 19:59:41 +0100 [thread overview]
Message-ID: <20200214185942.1147742-3-preichl@redhat.com> (raw)
In-Reply-To: <20200214185942.1147742-1-preichl@redhat.com>
In its current form, xfs_isilocked() is only able to test one lock type
at a time - ilock, iolock, or mmap lock, but combinations are not
properly handled. The intent here is to check that both XFS_IOLOCK_EXCL
and XFS_ILOCK_EXCL are held, so test them each separately.
The commit ecfea3f0c8c6 ("xfs: split xfs_bmap_shift_extents") ORed the
flags together which was an error, so this patch reverts that part of
the change and check the locks independently.
Fixes: ecfea3f0c8c6 ("xfs: split xfs_bmap_shift_extents")
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Suggested-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Pavel Reichl <preichl@redhat.com>
---
fs/xfs/libxfs/xfs_bmap.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index bc2be29193aa..c9dc94f114ed 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -5829,7 +5829,8 @@ xfs_bmap_collapse_extents(
if (XFS_FORCED_SHUTDOWN(mp))
return -EIO;
- ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL));
+ ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL));
+ ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
if (!(ifp->if_flags & XFS_IFEXTENTS)) {
error = xfs_iread_extents(tp, ip, whichfork);
@@ -5946,7 +5947,8 @@ xfs_bmap_insert_extents(
if (XFS_FORCED_SHUTDOWN(mp))
return -EIO;
- ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL));
+ ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL));
+ ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
if (!(ifp->if_flags & XFS_IFEXTENTS)) {
error = xfs_iread_extents(tp, ip, whichfork);
--
2.24.1
next prev parent reply other threads:[~2020-02-14 18:59 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-14 18:59 [PATCH v5 1/4] xfs: Refactor xfs_isilocked() Pavel Reichl
2020-02-14 18:59 ` [PATCH v5 2/4] xfs: clean up whitespace in xfs_isilocked() calls Pavel Reichl
2020-02-16 22:36 ` Dave Chinner
2020-02-17 13:33 ` Christoph Hellwig
2020-02-14 18:59 ` Pavel Reichl [this message]
2020-02-16 22:37 ` [PATCH v5 3/4] xfs: xfs_isilocked() can only check a single lock type Dave Chinner
2020-02-17 13:34 ` Christoph Hellwig
2020-02-14 18:59 ` [PATCH v5 4/4] xfs: replace mrlock_t with rw_semaphores Pavel Reichl
2020-02-16 22:39 ` Dave Chinner
2020-02-17 13:35 ` Christoph Hellwig
2020-02-15 1:38 ` [PATCH v5 1/4] xfs: Refactor xfs_isilocked() Chaitanya Kulkarni
2020-02-17 10:55 ` Pavel Reichl
2020-02-20 16:25 ` Chaitanya Kulkarni
2020-02-16 22:36 ` Dave Chinner
2020-02-17 13:35 ` Christoph Hellwig
2020-02-19 4:48 ` Darrick J. Wong
2020-02-19 17:31 ` Pavel Reichl
2020-02-19 18:40 ` Christoph Hellwig
2020-02-19 20:16 ` Eric Sandeen
2020-02-20 16:30 ` Pavel Reichl
2020-02-20 16:32 ` Christoph Hellwig
2020-02-20 17:26 ` Eric Sandeen
2020-02-20 17:27 ` Darrick J. Wong
2020-02-21 17:49 ` Pavel Reichl
2020-02-21 20:28 ` Eric Sandeen
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=20200214185942.1147742-3-preichl@redhat.com \
--to=preichl@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).