diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-05 08:38:55 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-05 08:38:55 +0300 |
| commit | 1cb434b20d85b90f2e5cf6cb80071069a052b1e1 (patch) | |
| tree | a8406cd7151efe597e78061996eda6a83cb03fdf | |
| parent | 004b50f4ed2accb56069d56714a32484f8b83ec0 (diff) | |
| parent | 576a488a27f267af203f3ea69c700a1612335e9f (diff) | |
| download | linux-1cb434b20d85b90f2e5cf6cb80071069a052b1e1.tar.xz | |
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
| -rw-r--r-- | fs/xfs/xfs_rename.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_rename.c b/fs/xfs/xfs_rename.c index d700dacdb10e..c903130be7fd 100644 --- a/fs/xfs/xfs_rename.c +++ b/fs/xfs/xfs_rename.c @@ -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; } |