diff options
author | Dave Chinner <dchinner@redhat.com> | 2012-05-08 06:48:53 -0400 |
---|---|---|
committer | Ben Myers <bpm@sgi.com> | 2012-05-21 11:45:43 -0400 |
commit | ea562ed6e7df5acd9392d993882c39e855099165 (patch) | |
tree | 0f91e73ae2adba9e0469a7a87abe44c13a880c70 /fs/xfs/xfs_vnodeops.c | |
parent | 1307bbd2af67283131728637e9489002adb26f10 (diff) |
xfs: fix delalloc quota accounting on failure
xfstest 270 was causing quota reservations way beyond what was sane
(ten to hundreds of TB) for a 4GB filesystem. There's a sign problem
in the error handling path of xfs_bmapi_reserve_delalloc() because
xfs_trans_unreserve_quota_nblks() simple negates the value passed -
which doesn't work for an unsigned variable. This causes
reservations of close to 2^32 block instead of removing a
reservation of a handful of blocks.
Fix the same problem in the other xfs_trans_unreserve_quota_nblks()
callers where unsigned integer variables are used, too.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_vnodeops.c')
-rw-r--r-- | fs/xfs/xfs_vnodeops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 82b000f8ad2f..b6a82d817a82 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
@@ -1916,7 +1916,7 @@ xfs_alloc_file_space( | |||
1916 | 1916 | ||
1917 | error0: /* Cancel bmap, unlock inode, unreserve quota blocks, cancel trans */ | 1917 | error0: /* Cancel bmap, unlock inode, unreserve quota blocks, cancel trans */ |
1918 | xfs_bmap_cancel(&free_list); | 1918 | xfs_bmap_cancel(&free_list); |
1919 | xfs_trans_unreserve_quota_nblks(tp, ip, qblocks, 0, quota_flag); | 1919 | xfs_trans_unreserve_quota_nblks(tp, ip, (long)qblocks, 0, quota_flag); |
1920 | 1920 | ||
1921 | error1: /* Just cancel transaction */ | 1921 | error1: /* Just cancel transaction */ |
1922 | xfs_trans_cancel(tp, XFS_TRANS_RELEASE_LOG_RES | XFS_TRANS_ABORT); | 1922 | xfs_trans_cancel(tp, XFS_TRANS_RELEASE_LOG_RES | XFS_TRANS_ABORT); |