Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs 

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  [XFS] Fix hang after disallowed rename across directory quota domains
parents 004b50f4 576a488a

fs/xfs/xfs_rename.c

+1 −1
Original line number Diff line number Diff line
@@ -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))) {

		error = XFS_ERROR(EXDEV);

		xfs_rename_unlock4(inodes, XFS_ILOCK_SHARED);

		xfs_rename_unlock4(inodes, XFS_ILOCK_EXCL);

		xfs_trans_cancel(tp, cancel_flags);

		goto std_return;

	}