diff options
| -rw-r--r-- | fs/xfs/xfs_bmap.c | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_iomap.c | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_vnodeops.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c index 478bce9e4043..58b815ec8c91 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c | |||
| @@ -4526,7 +4526,7 @@ out_unreserve_blocks: | |||
| 4526 | xfs_icsb_modify_counters(mp, XFS_SBS_FDBLOCKS, alen, 0); | 4526 | xfs_icsb_modify_counters(mp, XFS_SBS_FDBLOCKS, alen, 0); |
| 4527 | out_unreserve_quota: | 4527 | out_unreserve_quota: |
| 4528 | if (XFS_IS_QUOTA_ON(mp)) | 4528 | if (XFS_IS_QUOTA_ON(mp)) |
| 4529 | xfs_trans_unreserve_quota_nblks(NULL, ip, alen, 0, rt ? | 4529 | xfs_trans_unreserve_quota_nblks(NULL, ip, (long)alen, 0, rt ? |
| 4530 | XFS_QMOPT_RES_RTBLKS : XFS_QMOPT_RES_REGBLKS); | 4530 | XFS_QMOPT_RES_RTBLKS : XFS_QMOPT_RES_REGBLKS); |
| 4531 | return error; | 4531 | return error; |
| 4532 | } | 4532 | } |
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index 69c6e251c012..aadfce6681ee 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c | |||
| @@ -246,7 +246,7 @@ out_unlock: | |||
| 246 | 246 | ||
| 247 | out_bmap_cancel: | 247 | out_bmap_cancel: |
| 248 | xfs_bmap_cancel(&free_list); | 248 | xfs_bmap_cancel(&free_list); |
| 249 | xfs_trans_unreserve_quota_nblks(tp, ip, qblocks, 0, quota_flag); | 249 | xfs_trans_unreserve_quota_nblks(tp, ip, (long)qblocks, 0, quota_flag); |
| 250 | out_trans_cancel: | 250 | out_trans_cancel: |
| 251 | xfs_trans_cancel(tp, XFS_TRANS_RELEASE_LOG_RES | XFS_TRANS_ABORT); | 251 | xfs_trans_cancel(tp, XFS_TRANS_RELEASE_LOG_RES | XFS_TRANS_ABORT); |
| 252 | goto out_unlock; | 252 | goto out_unlock; |
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); |
