Commit 1cb434b2 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://

* 'for-linus' of git://
  [XFS] Fix hang after disallowed rename across directory quota domains
parents 004b50f4 576a488a
......@@ -212,7 +212,7 @@ xfs_rename(
if (unlikely((target_dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&
(target_dp->i_d.di_projid != src_ip->i_d.di_projid))) {
xfs_rename_unlock4(inodes, XFS_ILOCK_SHARED);
xfs_rename_unlock4(inodes, XFS_ILOCK_EXCL);
xfs_trans_cancel(tp, cancel_flags);
goto std_return;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment