summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_aops.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2015-06-04 13:55:48 +1000
committerDave Chinner <david@fromorbit.com>2015-06-04 13:55:48 +1000
commit4ea79766168b64766d6c9fcdaa9fab83a6cfebcf (patch)
tree7b29eaf46119a920f277b5cd13c818e2d35beafa /fs/xfs/xfs_aops.c
parent4497f28750cd129a669e32b7810dd755102aebbd (diff)
parentf78c3901074e113a04150230087f1d76033bb0a4 (diff)
downloadop-kernel-dev-4ea79766168b64766d6c9fcdaa9fab83a6cfebcf.zip
op-kernel-dev-4ea79766168b64766d6c9fcdaa9fab83a6cfebcf.tar.gz
Merge branch 'xfs-commit-cleanup' into for-next
Conflicts: fs/xfs/xfs_attr_inactive.c
Diffstat (limited to 'fs/xfs/xfs_aops.c')
-rw-r--r--fs/xfs/xfs_aops.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index e5e9fc2..dc52698 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -109,7 +109,7 @@ xfs_setfilesize_trans_alloc(
error = xfs_trans_reserve(tp, &M_RES(mp)->tr_fsyncts, 0, 0);
if (error) {
- xfs_trans_cancel(tp, 0);
+ xfs_trans_cancel(tp);
return error;
}
@@ -145,7 +145,7 @@ xfs_setfilesize(
isize = xfs_new_eof(ip, offset + size);
if (!isize) {
xfs_iunlock(ip, XFS_ILOCK_EXCL);
- xfs_trans_cancel(tp, 0);
+ xfs_trans_cancel(tp);
return 0;
}
@@ -155,7 +155,7 @@ xfs_setfilesize(
xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
- return xfs_trans_commit(tp, 0);
+ return xfs_trans_commit(tp);
}
STATIC int
OpenPOWER on IntegriCloud