From: Brian Foster <bfoster@redhat.com>
To: xfs@oss.sgi.com
Subject: [PATCH v2 11/12] xfs: fix btree cursor error cleanups
Date: Fri, 7 Aug 2015 17:15:27 -0400 [thread overview]
Message-ID: <1438982128-38618-12-git-send-email-bfoster@redhat.com> (raw)
In-Reply-To: <1438982128-38618-1-git-send-email-bfoster@redhat.com>
The btree cursor cleanup function takes an error parameter that affects
how buffers are released from the cursor. All buffers are released in
the event of error. Several callers do not specify the XFS_BTREE_ERROR
flag in the event of error, however. This can cause buffers to hang
around locked or with an elevated hold count and thus lead to umount
hangs in the event of errors.
Fix up the xfs_btree_del_cursor() callers to pass XFS_BTREE_ERROR if the
cursor is being torn down due to error.
Signed-off-by: Brian Foster <bfoster@redhat.com>
---
fs/xfs/libxfs/xfs_ialloc.c | 2 +-
fs/xfs/xfs_itable.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c
index ce63e04..54deb2d 100644
--- a/fs/xfs/libxfs/xfs_ialloc.c
+++ b/fs/xfs/libxfs/xfs_ialloc.c
@@ -2233,7 +2233,7 @@ xfs_imap_lookup(
}
xfs_trans_brelse(tp, agbp);
- xfs_btree_del_cursor(cur, XFS_BTREE_NOERROR);
+ xfs_btree_del_cursor(cur, error ? XFS_BTREE_ERROR : XFS_BTREE_NOERROR);
if (error)
return error;
diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index f41b0c3..930ebd8 100644
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -473,7 +473,8 @@ xfs_bulkstat(
* pending error, then we are done.
*/
del_cursor:
- xfs_btree_del_cursor(cur, XFS_BTREE_NOERROR);
+ xfs_btree_del_cursor(cur, error ?
+ XFS_BTREE_ERROR : XFS_BTREE_NOERROR);
xfs_buf_relse(agbp);
if (error)
break;
--
2.1.0
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2015-08-07 21:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-07 21:15 [PATCH v2 00/12] xfs: miscellaneous logging, recovery, umount fixes Brian Foster
2015-08-07 21:15 ` [PATCH v2 01/12] xfs: disentagle EFI release from the extent count Brian Foster
2015-08-07 21:15 ` [PATCH v2 02/12] xfs: return committed status from xfs_trans_roll() Brian Foster
2015-08-07 21:15 ` [PATCH v2 03/12] xfs: fix efi/efd error handling to avoid fs shutdown hangs Brian Foster
2015-08-07 21:15 ` [PATCH v2 04/12] xfs: ensure EFD trans aborts on log recovery extent free failure Brian Foster
2015-08-07 21:15 ` [PATCH v2 05/12] xfs: use EFI refcount consistently in log recovery Brian Foster
2015-08-07 21:15 ` [PATCH v2 06/12] xfs: don't leave EFIs on AIL on mount failure Brian Foster
2015-08-07 21:15 ` [PATCH v2 07/12] xfs: icreate log item recovery and cancellation tracepoints Brian Foster
2015-08-07 21:15 ` [PATCH v2 08/12] xfs: fix broken icreate log item cancellation Brian Foster
2015-08-07 21:15 ` [PATCH v2 09/12] xfs: checksum log record ext headers based on record size Brian Foster
2015-08-07 21:15 ` [PATCH v2 10/12] xfs: clean up root inode properly on mount failure Brian Foster
2015-08-07 21:15 ` Brian Foster [this message]
2015-08-07 21:15 ` [PATCH v2 12/12] xfs: add helper to conditionally remove items from the AIL 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=1438982128-38618-12-git-send-email-bfoster@redhat.com \
--to=bfoster@redhat.com \
--cc=xfs@oss.sgi.com \
/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