projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
[firefly-linux-kernel-4.4.55.git]
/
fs
/
xfs
/
xfs_iomap.c
diff --git
a/fs/xfs/xfs_iomap.c
b/fs/xfs/xfs_iomap.c
index 38e633bad8c2a2c919d1b1c9a4b9bda1d24d2ec4..1f86033171c84ef4b12a201e112c9c37c7c69bdf 100644
(file)
--- a/
fs/xfs/xfs_iomap.c
+++ b/
fs/xfs/xfs_iomap.c
@@
-183,7
+183,7
@@
xfs_iomap_write_direct(
* Check for running out of space, note: need lock to return
*/
if (error) {
* Check for running out of space, note: need lock to return
*/
if (error) {
- xfs_trans_cancel(tp
, 0
);
+ xfs_trans_cancel(tp);
return error;
}
return error;
}
@@
-213,7
+213,7
@@
xfs_iomap_write_direct(
error = xfs_bmap_finish(&tp, &free_list, &committed);
if (error)
goto out_bmap_cancel;
error = xfs_bmap_finish(&tp, &free_list, &committed);
if (error)
goto out_bmap_cancel;
- error = xfs_trans_commit(tp
, XFS_TRANS_RELEASE_LOG_RES
);
+ error = xfs_trans_commit(tp);
if (error)
goto out_unlock;
if (error)
goto out_unlock;
@@
-236,7
+236,7
@@
out_bmap_cancel:
xfs_bmap_cancel(&free_list);
xfs_trans_unreserve_quota_nblks(tp, ip, (long)qblocks, 0, quota_flag);
out_trans_cancel:
xfs_bmap_cancel(&free_list);
xfs_trans_unreserve_quota_nblks(tp, ip, (long)qblocks, 0, quota_flag);
out_trans_cancel:
- xfs_trans_cancel(tp
, XFS_TRANS_RELEASE_LOG_RES | XFS_TRANS_ABORT
);
+ xfs_trans_cancel(tp);
goto out_unlock;
}
goto out_unlock;
}
@@
-690,7
+690,7
@@
xfs_iomap_write_allocate(
error = xfs_trans_reserve(tp, &M_RES(mp)->tr_write,
nres, 0);
if (error) {
error = xfs_trans_reserve(tp, &M_RES(mp)->tr_write,
nres, 0);
if (error) {
- xfs_trans_cancel(tp
, 0
);
+ xfs_trans_cancel(tp);
return error;
}
xfs_ilock(ip, XFS_ILOCK_EXCL);
return error;
}
xfs_ilock(ip, XFS_ILOCK_EXCL);
@@
-760,7
+760,7
@@
xfs_iomap_write_allocate(
if (error)
goto trans_cancel;
if (error)
goto trans_cancel;
- error = xfs_trans_commit(tp
, XFS_TRANS_RELEASE_LOG_RES
);
+ error = xfs_trans_commit(tp);
if (error)
goto error0;
if (error)
goto error0;
@@
-791,7
+791,7
@@
xfs_iomap_write_allocate(
trans_cancel:
xfs_bmap_cancel(&free_list);
trans_cancel:
xfs_bmap_cancel(&free_list);
- xfs_trans_cancel(tp
, XFS_TRANS_RELEASE_LOG_RES | XFS_TRANS_ABORT
);
+ xfs_trans_cancel(tp);
error0:
xfs_iunlock(ip, XFS_ILOCK_EXCL);
return error;
error0:
xfs_iunlock(ip, XFS_ILOCK_EXCL);
return error;
@@
-853,7
+853,7
@@
xfs_iomap_write_unwritten(
error = xfs_trans_reserve(tp, &M_RES(mp)->tr_write,
resblks, 0);
if (error) {
error = xfs_trans_reserve(tp, &M_RES(mp)->tr_write,
resblks, 0);
if (error) {
- xfs_trans_cancel(tp
, 0
);
+ xfs_trans_cancel(tp);
return error;
}
return error;
}
@@
-890,7
+890,7
@@
xfs_iomap_write_unwritten(
if (error)
goto error_on_bmapi_transaction;
if (error)
goto error_on_bmapi_transaction;
- error = xfs_trans_commit(tp
, XFS_TRANS_RELEASE_LOG_RES
);
+ error = xfs_trans_commit(tp);
xfs_iunlock(ip, XFS_ILOCK_EXCL);
if (error)
return error;
xfs_iunlock(ip, XFS_ILOCK_EXCL);
if (error)
return error;
@@
-914,7
+914,7
@@
xfs_iomap_write_unwritten(
error_on_bmapi_transaction:
xfs_bmap_cancel(&free_list);
error_on_bmapi_transaction:
xfs_bmap_cancel(&free_list);
- xfs_trans_cancel(tp
, (XFS_TRANS_RELEASE_LOG_RES | XFS_TRANS_ABORT)
);
+ xfs_trans_cancel(tp);
xfs_iunlock(ip, XFS_ILOCK_EXCL);
return error;
}
xfs_iunlock(ip, XFS_ILOCK_EXCL);
return error;
}