diff options
Diffstat (limited to 'fs/xfs/xfs_trans.c')
-rw-r--r-- | fs/xfs/xfs_trans.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index efc147f0e9b6..1f35b2feca97 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c | |||
@@ -1790,9 +1790,7 @@ xfs_trans_commit_cil( | |||
1790 | } | 1790 | } |
1791 | 1791 | ||
1792 | /* | 1792 | /* |
1793 | * xfs_trans_commit | 1793 | * Commit the given transaction to the log. |
1794 | * | ||
1795 | * Commit the given transaction to the log a/synchronously. | ||
1796 | * | 1794 | * |
1797 | * XFS disk error handling mechanism is not based on a typical | 1795 | * XFS disk error handling mechanism is not based on a typical |
1798 | * transaction abort mechanism. Logically after the filesystem | 1796 | * transaction abort mechanism. Logically after the filesystem |
@@ -1804,10 +1802,9 @@ xfs_trans_commit_cil( | |||
1804 | * Do not reference the transaction structure after this call. | 1802 | * Do not reference the transaction structure after this call. |
1805 | */ | 1803 | */ |
1806 | int | 1804 | int |
1807 | _xfs_trans_commit( | 1805 | xfs_trans_commit( |
1808 | struct xfs_trans *tp, | 1806 | struct xfs_trans *tp, |
1809 | uint flags, | 1807 | uint flags) |
1810 | int *log_flushed) | ||
1811 | { | 1808 | { |
1812 | struct xfs_mount *mp = tp->t_mountp; | 1809 | struct xfs_mount *mp = tp->t_mountp; |
1813 | xfs_lsn_t commit_lsn = -1; | 1810 | xfs_lsn_t commit_lsn = -1; |
@@ -1866,7 +1863,7 @@ _xfs_trans_commit( | |||
1866 | if (sync) { | 1863 | if (sync) { |
1867 | if (!error) { | 1864 | if (!error) { |
1868 | error = _xfs_log_force_lsn(mp, commit_lsn, | 1865 | error = _xfs_log_force_lsn(mp, commit_lsn, |
1869 | XFS_LOG_SYNC, log_flushed); | 1866 | XFS_LOG_SYNC, NULL); |
1870 | } | 1867 | } |
1871 | XFS_STATS_INC(xs_trans_sync); | 1868 | XFS_STATS_INC(xs_trans_sync); |
1872 | } else { | 1869 | } else { |
@@ -2021,6 +2018,6 @@ xfs_trans_roll( | |||
2021 | if (error) | 2018 | if (error) |
2022 | return error; | 2019 | return error; |
2023 | 2020 | ||
2024 | xfs_trans_ijoin(trans, dp); | 2021 | xfs_trans_ijoin(trans, dp, 0); |
2025 | return 0; | 2022 | return 0; |
2026 | } | 2023 | } |