On Fri, Apr 24, 2020 at 04:05:30PM -0700, Suraj Jitindar Singh wrote: > This series backports two patches which fix known bugs in the xfs > filesystem code to the v4.14.y stable tree. > > They are each verified by the xfs tests xfs/439 and generic/585 > respectively. > > The first patch applies cleanly. > > The second patch required slight massage due to the last code block > being removed having changed slightly upstream due to rework. I think > the backport is functionally equivalent. > Only thing is I request comment that it is correct to use the following > error path: > > ASSERT(VFS_I(wip)->i_nlink == 0); > error = xfs_iunlink_remove(tp, wip); > if (error) > > goto out_trans_cancel; > > The old error patch out_bmap_cancel still exists here. However as > nothing can have modified the deferred ops struct at this point I > believe it is sufficient to go to the "out_trans_cancel" error label. > > Darrick J. Wong (1): > xfs: validate sb_logsunit is a multiple of the fs blocksize > > kaixuxia (1): > xfs: Fix deadlock between AGI and AGF with RENAME_WHITEOUT > > fs/xfs/xfs_inode.c | 85 +++++++++++++++++++++++----------------------- > fs/xfs/xfs_log.c | 14 +++++++- > 2 files changed, 55 insertions(+), 44 deletions(-) All (including the 4.19 patch), now queued up, thanks. greg k-h