diff options
| author | Dave Chinner <dchinner@redhat.com> | 2018-06-07 14:54:17 -0500 |
|---|---|---|
| committer | Eric Sandeen <sandeen@redhat.com> | 2018-06-07 14:54:17 -0500 |
| commit | e05de95096511e8d63dd0648435d88265a2231c3 (patch) | |
| tree | 9aae56d2727c0c339b2813ce39cd6d0231c81473 | |
| parent | 32898e223c36a2b01703bebe71097f01f241ffad (diff) | |
| download | xfsprogs-dev-libxfs-4.18-sync.tar.gz | |
xfs: fix error handling in xfs_refcount_insert()libxfs-4.18-sync
Source kernel commit: 16858f7c21156e676c98a5f6532f68cacbde3784
generic/475 fired an assert failure just after the filesystem was
shut down:
XFS: Assertion failed: fs_is_ok, file: fs/xfs/libxfs/xfs_refcount.c, line: 182
.....
Call Trace:
xfs_refcount_insert+0x151/0x190
xfs_refcount_adjust_extents.constprop.11+0x9c/0x470
xfs_refcount_adjust.constprop.10+0xb0/0x270
xfs_refcount_finish_one+0x25a/0x420
xfs_trans_log_finish_refcount_update+0x2a/0x40
xfs_refcount_update_finish_item+0x35/0xa0
xfs_defer_finish+0x15e/0x4d0
xfs_reflink_remap_extent+0x1bc/0x610
xfs_reflink_remap_blocks+0x6e/0x280
xfs_reflink_remap_range+0x311/0x530
vfs_clone_file_range+0x119/0x200
....
If xfs_btree_insert() returns an error, the corruption check fires
instead of passing the error back the caller. The corruption check
should be after we've checked for an error, not before, thereby
avoiding assert failures if the filesystem shuts down during a
refcount btree record insert.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
| -rw-r--r-- | libxfs/xfs_refcount.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libxfs/xfs_refcount.c b/libxfs/xfs_refcount.c index 988a0a74c2..bc03b30ae1 100644 --- a/libxfs/xfs_refcount.c +++ b/libxfs/xfs_refcount.c @@ -178,7 +178,10 @@ xfs_refcount_insert( cur->bc_rec.rc.rc_blockcount = irec->rc_blockcount; cur->bc_rec.rc.rc_refcount = irec->rc_refcount; error = xfs_btree_insert(cur, i); + if (error) + goto out_error; XFS_WANT_CORRUPTED_GOTO(cur->bc_mp, *i == 1, out_error); + out_error: if (error) trace_xfs_refcount_insert_error(cur->bc_mp, |