diff options
| author | Dave Chinner | 2015-06-04 05:55:48 +0200 |
|---|---|---|
| committer | Dave Chinner | 2015-06-04 05:55:48 +0200 |
| commit | 4ea79766168b64766d6c9fcdaa9fab83a6cfebcf (patch) | |
| tree | 7b29eaf46119a920f277b5cd13c818e2d35beafa /fs/xfs/xfs_file.c | |
| parent | Merge branch 'xfs-misc-fixes-for-4.2-2' into for-next (diff) | |
| parent | xfs: fix xfs_log_done interface (diff) | |
| download | kernel-qcow2-linux-4ea79766168b64766d6c9fcdaa9fab83a6cfebcf.tar.gz kernel-qcow2-linux-4ea79766168b64766d6c9fcdaa9fab83a6cfebcf.tar.xz kernel-qcow2-linux-4ea79766168b64766d6c9fcdaa9fab83a6cfebcf.zip | |
Merge branch 'xfs-commit-cleanup' into for-next
Conflicts:
fs/xfs/xfs_attr_inactive.c
Diffstat (limited to 'fs/xfs/xfs_file.c')
| -rw-r--r-- | fs/xfs/xfs_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 84b2421b22ae..97d92c144768 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -147,7 +147,7 @@ xfs_update_prealloc_flags( tp = xfs_trans_alloc(ip->i_mount, XFS_TRANS_WRITEID); error = xfs_trans_reserve(tp, &M_RES(ip->i_mount)->tr_writeid, 0, 0); if (error) { - xfs_trans_cancel(tp, 0); + xfs_trans_cancel(tp); return error; } @@ -169,7 +169,7 @@ xfs_update_prealloc_flags( xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); if (flags & XFS_PREALLOC_SYNC) xfs_trans_set_sync(tp); - return xfs_trans_commit(tp, 0); + return xfs_trans_commit(tp); } /* |