From: Pavel Reichl <preichl@redhat.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v4 3/4] xfs: Fix bug when checking diff. locks
Date: Tue, 11 Feb 2020 23:10:17 +0100 [thread overview]
Message-ID: <20200211221018.709125-3-preichl@redhat.com> (raw)
In-Reply-To: <20200211221018.709125-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>
---
Changelog from V3:
Commit message extened.
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-11 22:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-11 22:10 [PATCH v4 1/4] xfs: Refactor xfs_isilocked() Pavel Reichl
2020-02-11 22:10 ` [PATCH v4 2/4] xfs: Fix WS in xfs_isilocked() calls Pavel Reichl
2020-02-12 0:35 ` Dave Chinner
2020-02-11 22:10 ` Pavel Reichl [this message]
2020-02-12 0:38 ` [PATCH v4 3/4] xfs: Fix bug when checking diff. locks Dave Chinner
2020-02-11 22:10 ` [PATCH v4 4/4] xfs: Replace mrlock_t by rw_semaphore Pavel Reichl
2020-02-12 0:49 ` Dave Chinner
2020-02-11 22:27 ` [PATCH v4 1/4] xfs: Refactor xfs_isilocked() 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=20200211221018.709125-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).