diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-05-08 19:51:42 +1000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-05-08 19:51:42 +1000 |
| commit | b1ecdda9313ec5d2f971993f44f6b657acf70cff (patch) | |
| tree | a6ae6305952ad79e7e75f66598b4ba5c60146b4f /fs/xfs | |
| parent | d08d389d5aef0509edba7ee42cd6c6a3998fee22 (diff) | |
| download | blackbird-op-linux-b1ecdda9313ec5d2f971993f44f6b657acf70cff.tar.gz blackbird-op-linux-b1ecdda9313ec5d2f971993f44f6b657acf70cff.zip | |
[XFS] Fix a project quota space accounting leak on rename.
SGI-PV: 951636
SGI-Modid: xfs-linux-melb:xfs-kern:25811a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/xfs_rename.c | 12 | ||||
| -rw-r--r-- | fs/xfs/xfs_vnodeops.c | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/fs/xfs/xfs_rename.c b/fs/xfs/xfs_rename.c index 81a05cfd77d2..1f148762eb28 100644 --- a/fs/xfs/xfs_rename.c +++ b/fs/xfs/xfs_rename.c @@ -316,6 +316,18 @@ xfs_rename( } } + /* + * If we are using project inheritance, we only allow renames + * into our tree when the project IDs are the same; else the + * tree quota mechanism would be circumvented. + */ + 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); + goto rele_return; + } + new_parent = (src_dp != target_dp); src_is_directory = ((src_ip->i_d.di_mode & S_IFMT) == S_IFDIR); diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index fa71b305ba5c..7027ae68ee38 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c @@ -2663,7 +2663,7 @@ xfs_link( */ if (unlikely((tdp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) && (tdp->i_d.di_projid != sip->i_d.di_projid))) { - error = XFS_ERROR(EPERM); + error = XFS_ERROR(EXDEV); goto error_return; } |
