diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-08-19 10:10:47 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-08-19 10:10:47 +1000 |
| commit | 5be203ad115c1d8294e8685253e05fcea0202e04 (patch) | |
| tree | fb30d691376436a934ab117fa8d5ff4a8f5bc508 /fs/xfs/xfs_inode.c | |
| parent | 5461ad99cab98d19f2570c468cdd6c42b6d66795 (diff) | |
| parent | d4a97a04227d5ba91b91888a016e2300861cfbc7 (diff) | |
| download | linux-5be203ad115c1d8294e8685253e05fcea0202e04.tar.gz linux-5be203ad115c1d8294e8685253e05fcea0202e04.tar.bz2 linux-5be203ad115c1d8294e8685253e05fcea0202e04.zip | |
Merge branch 'xfs-efi-rework' into for-next
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index d22a984d8470..d8230ba1b471 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -1785,14 +1785,15 @@ xfs_inactive_ifree( xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_ICOUNT, -1); /* - * Just ignore errors at this point. There is nothing we can - * do except to try to keep going. Make sure it's not a silent - * error. + * Just ignore errors at this point. There is nothing we can do except + * to try to keep going. Make sure it's not a silent error. */ error = xfs_bmap_finish(&tp, &free_list, &committed); - if (error) + if (error) { xfs_notice(mp, "%s: xfs_bmap_finish returned error %d", __func__, error); + xfs_bmap_cancel(&free_list); + } error = xfs_trans_commit(tp); if (error) xfs_notice(mp, "%s: xfs_trans_commit returned error %d", |