diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-06-04 05:55:48 +0200 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-06-04 05:55:48 +0200 |
| commit | 4ea79766168b64766d6c9fcdaa9fab83a6cfebcf (patch) | |
| tree | 7b29eaf46119a920f277b5cd13c818e2d35beafa /fs/xfs/xfs_fsops.c | |
| parent | Merge branch 'xfs-misc-fixes-for-4.2-2' into for-next (diff) | |
| parent | xfs: fix xfs_log_done interface (diff) | |
| download | linux-4ea79766168b64766d6c9fcdaa9fab83a6cfebcf.tar.xz linux-4ea79766168b64766d6c9fcdaa9fab83a6cfebcf.zip | |
Merge branch 'xfs-commit-cleanup' into for-next
Conflicts:
fs/xfs/xfs_attr_inactive.c
Diffstat (limited to 'fs/xfs/xfs_fsops.c')
| -rw-r--r-- | fs/xfs/xfs_fsops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index 4bd6463cd931..9b3438a7680f 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c @@ -203,7 +203,7 @@ xfs_growfs_data_private( error = xfs_trans_reserve(tp, &M_RES(mp)->tr_growdata, XFS_GROWFS_SPACE_RES(mp), 0); if (error) { - xfs_trans_cancel(tp, 0); + xfs_trans_cancel(tp); return error; } @@ -491,7 +491,7 @@ xfs_growfs_data_private( if (dpct) xfs_trans_mod_sb(tp, XFS_TRANS_SB_IMAXPCT, dpct); xfs_trans_set_sync(tp); - error = xfs_trans_commit(tp, 0); + error = xfs_trans_commit(tp); if (error) return error; @@ -559,7 +559,7 @@ xfs_growfs_data_private( return saved_error ? saved_error : error; error0: - xfs_trans_cancel(tp, XFS_TRANS_ABORT); + xfs_trans_cancel(tp); return error; } |