From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 2/5] xfs: don't iunlock unlocked inodes
Date: Fri, 12 Jan 2018 14:04:12 -0800 [thread overview]
Message-ID: <151579465207.8694.2459805113822761321.stgit@magnolia> (raw)
In-Reply-To: <151579463950.8694.320025813242574491.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Don't iunlock an unlocked inode, which can happen if the parent pointer
scrubber bails out with sc->ip unlocked while trying to grab the parent
directory inode.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/scrub/scrub.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/scrub/scrub.c b/fs/xfs/scrub/scrub.c
index 9c177ea..89178b9 100644
--- a/fs/xfs/scrub/scrub.c
+++ b/fs/xfs/scrub/scrub.c
@@ -193,7 +193,8 @@ xfs_scrub_teardown(
sc->fs_frozen = false;
}
if (sc->ip) {
- xfs_iunlock(sc->ip, sc->ilock_flags);
+ if (sc->ilock_flags)
+ xfs_iunlock(sc->ip, sc->ilock_flags);
if (sc->ip != ip_in &&
!xfs_internal_inum(sc->mp, sc->ip->i_ino))
iput(VFS_I(sc->ip));
next prev parent reply other threads:[~2018-01-12 22:14 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-12 22:03 [PATCH 0/5] xfs: kasan/ubsan fixes Darrick J. Wong
2018-01-12 22:04 ` [PATCH 1/5] xfs: check sb_agblocks and sb_agblklog when validating superblock Darrick J. Wong
2018-01-15 14:41 ` Brian Foster
2018-01-15 19:49 ` Darrick J. Wong
2018-01-15 20:03 ` [PATCH v2 " Darrick J. Wong
2018-01-15 21:31 ` Dave Chinner
2018-01-16 7:00 ` Darrick J. Wong
2018-01-16 12:48 ` Brian Foster
2018-01-16 17:34 ` Darrick J. Wong
2018-01-16 18:02 ` Brian Foster
2018-01-16 21:10 ` Darrick J. Wong
2018-01-17 1:20 ` [PATCH v3 " Darrick J. Wong
2018-01-17 12:55 ` Brian Foster
2018-01-12 22:04 ` Darrick J. Wong [this message]
2018-01-15 14:41 ` [PATCH 2/5] xfs: don't iunlock unlocked inodes Brian Foster
2018-01-12 22:04 ` [PATCH 3/5] xfs: directory scrubber must walk through data block to offset Darrick J. Wong
2018-01-15 14:41 ` Brian Foster
2018-01-15 19:53 ` Darrick J. Wong
2018-01-15 20:04 ` [PATCH v2 " Darrick J. Wong
2018-01-15 21:56 ` Dave Chinner
2018-01-16 7:01 ` Darrick J. Wong
2018-01-16 23:30 ` [PATCH v3 " Darrick J. Wong
2018-01-17 0:29 ` Dave Chinner
2018-01-12 22:04 ` [PATCH 4/5] xfs: attr leaf verifier needs to check for obviously bad count Darrick J. Wong
2018-01-15 14:42 ` Brian Foster
2018-01-15 19:59 ` Darrick J. Wong
2018-01-15 20:05 ` [PATCH v2 " Darrick J. Wong
2018-01-16 12:50 ` Brian Foster
2018-01-16 23:32 ` Darrick J. Wong
2018-01-12 22:04 ` [PATCH 5/5] xfs: btree format ifork loader should check for zero numrecs Darrick J. Wong
2018-01-15 14:42 ` Brian Foster
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=151579465207.8694.2459805113822761321.stgit@magnolia \
--to=darrick.wong@oracle.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.