diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-06-04 06:55:48 +0300 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-06-04 06:55:48 +0300 |
| commit | 4ea79766168b64766d6c9fcdaa9fab83a6cfebcf (patch) | |
| tree | 7b29eaf46119a920f277b5cd13c818e2d35beafa /fs/xfs/libxfs/xfs_sb.c | |
| parent | 4497f28750cd129a669e32b7810dd755102aebbd (diff) | |
| parent | f78c3901074e113a04150230087f1d76033bb0a4 (diff) | |
| download | linux-4ea79766168b64766d6c9fcdaa9fab83a6cfebcf.tar.xz | |
Merge branch 'xfs-commit-cleanup' into for-next
Conflicts:
fs/xfs/xfs_attr_inactive.c
Diffstat (limited to 'fs/xfs/libxfs/xfs_sb.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_sb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c index 019dc324a146..df9851c46b5c 100644 --- a/fs/xfs/libxfs/xfs_sb.c +++ b/fs/xfs/libxfs/xfs_sb.c @@ -818,12 +818,12 @@ xfs_sync_sb( tp = _xfs_trans_alloc(mp, XFS_TRANS_SB_CHANGE, KM_SLEEP); error = xfs_trans_reserve(tp, &M_RES(mp)->tr_sb, 0, 0); if (error) { - xfs_trans_cancel(tp, 0); + xfs_trans_cancel(tp); return error; } xfs_log_sb(tp); if (wait) xfs_trans_set_sync(tp); - return xfs_trans_commit(tp, 0); + return xfs_trans_commit(tp); } |