xfs: fix btree cursor error cleanups
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> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Родитель
0ae120f8a8
Коммит
f307080a62
|
@ -2232,7 +2232,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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче