aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_vnodeops.c
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@sandeen.net>2007-05-07 23:48:42 -0400
committerTim Shimmin <tes@sgi.com>2007-05-07 23:48:42 -0400
commit1c72bf90037f32fc2b10e0a05dff2640abce8ee2 (patch)
tree3903e287eed6b6e942340d01bec360edebff594e /fs/xfs/xfs_vnodeops.c
parent5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff)
[XFS] The last argument "lsn" of xfs_trans_commit() is always called with
NULL. Patch provided by Eric Sandeen. SGI-PV: 961693 SGI-Modid: xfs-linux-melb:xfs-kern:28199a Signed-off-by: Eric Sandeen <sandeen@sandeen.net> Signed-off-by: Lachlan McIlroy <lachlan@sgi.com> Signed-off-by: Tim Shimmin <tes@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_vnodeops.c')
-rw-r--r--fs/xfs/xfs_vnodeops.c33
1 files changed, 16 insertions, 17 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 52c41714ec54..6202a9318a76 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -873,7 +873,7 @@ xfs_setattr(
873 if (mp->m_flags & XFS_MOUNT_WSYNC) 873 if (mp->m_flags & XFS_MOUNT_WSYNC)
874 xfs_trans_set_sync(tp); 874 xfs_trans_set_sync(tp);
875 875
876 code = xfs_trans_commit(tp, commit_flags, NULL); 876 code = xfs_trans_commit(tp, commit_flags);
877 } 877 }
878 878
879 /* 879 /*
@@ -1176,7 +1176,7 @@ xfs_fsync(
1176 xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); 1176 xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
1177 if (flag & FSYNC_WAIT) 1177 if (flag & FSYNC_WAIT)
1178 xfs_trans_set_sync(tp); 1178 xfs_trans_set_sync(tp);
1179 error = _xfs_trans_commit(tp, 0, NULL, &log_flushed); 1179 error = _xfs_trans_commit(tp, 0, &log_flushed);
1180 1180
1181 xfs_iunlock(ip, XFS_ILOCK_EXCL); 1181 xfs_iunlock(ip, XFS_ILOCK_EXCL);
1182 } 1182 }
@@ -1291,8 +1291,7 @@ xfs_inactive_free_eofblocks(
1291 XFS_TRANS_ABORT)); 1291 XFS_TRANS_ABORT));
1292 } else { 1292 } else {
1293 error = xfs_trans_commit(tp, 1293 error = xfs_trans_commit(tp,
1294 XFS_TRANS_RELEASE_LOG_RES, 1294 XFS_TRANS_RELEASE_LOG_RES);
1295 NULL);
1296 } 1295 }
1297 xfs_iunlock(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL); 1296 xfs_iunlock(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL);
1298 } 1297 }
@@ -1406,7 +1405,7 @@ xfs_inactive_symlink_rmt(
1406 * we need to unlock the inode since the new transaction doesn't 1405 * we need to unlock the inode since the new transaction doesn't
1407 * have the inode attached. 1406 * have the inode attached.
1408 */ 1407 */
1409 error = xfs_trans_commit(tp, 0, NULL); 1408 error = xfs_trans_commit(tp, 0);
1410 tp = ntp; 1409 tp = ntp;
1411 if (error) { 1410 if (error) {
1412 ASSERT(XFS_FORCED_SHUTDOWN(mp)); 1411 ASSERT(XFS_FORCED_SHUTDOWN(mp));
@@ -1503,7 +1502,7 @@ xfs_inactive_attrs(
1503 tp = *tpp; 1502 tp = *tpp;
1504 mp = ip->i_mount; 1503 mp = ip->i_mount;
1505 ASSERT(ip->i_d.di_forkoff != 0); 1504 ASSERT(ip->i_d.di_forkoff != 0);
1506 xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); 1505 xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
1507 xfs_iunlock(ip, XFS_ILOCK_EXCL); 1506 xfs_iunlock(ip, XFS_ILOCK_EXCL);
1508 1507
1509 error = xfs_attr_inactive(ip); 1508 error = xfs_attr_inactive(ip);
@@ -1790,7 +1789,7 @@ xfs_inactive(
1790 * nothing we can do except to try to keep going. 1789 * nothing we can do except to try to keep going.
1791 */ 1790 */
1792 (void) xfs_bmap_finish(&tp, &free_list, &committed); 1791 (void) xfs_bmap_finish(&tp, &free_list, &committed);
1793 (void) xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); 1792 (void) xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
1794 } 1793 }
1795 /* 1794 /*
1796 * Release the dquots held by inode, if any. 1795 * Release the dquots held by inode, if any.
@@ -2026,7 +2025,7 @@ xfs_create(
2026 goto abort_rele; 2025 goto abort_rele;
2027 } 2026 }
2028 2027
2029 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); 2028 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
2030 if (error) { 2029 if (error) {
2031 IRELE(ip); 2030 IRELE(ip);
2032 tp = NULL; 2031 tp = NULL;
@@ -2511,7 +2510,7 @@ xfs_remove(
2511 goto error_rele; 2510 goto error_rele;
2512 } 2511 }
2513 2512
2514 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); 2513 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
2515 if (error) { 2514 if (error) {
2516 IRELE(ip); 2515 IRELE(ip);
2517 goto std_return; 2516 goto std_return;
@@ -2719,7 +2718,7 @@ xfs_link(
2719 goto abort_return; 2718 goto abort_return;
2720 } 2719 }
2721 2720
2722 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); 2721 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
2723 if (error) 2722 if (error)
2724 goto std_return; 2723 goto std_return;
2725 2724
@@ -2936,7 +2935,7 @@ xfs_mkdir(
2936 goto error2; 2935 goto error2;
2937 } 2936 }
2938 2937
2939 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); 2938 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
2940 XFS_QM_DQRELE(mp, udqp); 2939 XFS_QM_DQRELE(mp, udqp);
2941 XFS_QM_DQRELE(mp, gdqp); 2940 XFS_QM_DQRELE(mp, gdqp);
2942 if (error) { 2941 if (error) {
@@ -3190,7 +3189,7 @@ xfs_rmdir(
3190 goto std_return; 3189 goto std_return;
3191 } 3190 }
3192 3191
3193 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); 3192 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
3194 if (error) { 3193 if (error) {
3195 IRELE(cdp); 3194 IRELE(cdp);
3196 goto std_return; 3195 goto std_return;
@@ -3535,7 +3534,7 @@ xfs_symlink(
3535 if (error) { 3534 if (error) {
3536 goto error2; 3535 goto error2;
3537 } 3536 }
3538 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); 3537 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
3539 XFS_QM_DQRELE(mp, udqp); 3538 XFS_QM_DQRELE(mp, udqp);
3540 XFS_QM_DQRELE(mp, gdqp); 3539 XFS_QM_DQRELE(mp, gdqp);
3541 3540
@@ -3790,7 +3789,7 @@ xfs_set_dmattrs (
3790 3789
3791 xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); 3790 xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
3792 IHOLD(ip); 3791 IHOLD(ip);
3793 error = xfs_trans_commit(tp, 0, NULL); 3792 error = xfs_trans_commit(tp, 0);
3794 3793
3795 return error; 3794 return error;
3796} 3795}
@@ -4148,7 +4147,7 @@ retry:
4148 goto error0; 4147 goto error0;
4149 } 4148 }
4150 4149
4151 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); 4150 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
4152 xfs_iunlock(ip, XFS_ILOCK_EXCL); 4151 xfs_iunlock(ip, XFS_ILOCK_EXCL);
4153 if (error) { 4152 if (error) {
4154 break; 4153 break;
@@ -4455,7 +4454,7 @@ xfs_free_file_space(
4455 goto error0; 4454 goto error0;
4456 } 4455 }
4457 4456
4458 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); 4457 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
4459 xfs_iunlock(ip, XFS_ILOCK_EXCL); 4458 xfs_iunlock(ip, XFS_ILOCK_EXCL);
4460 } 4459 }
4461 4460
@@ -4649,7 +4648,7 @@ xfs_change_file_space(
4649 xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); 4648 xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
4650 xfs_trans_set_sync(tp); 4649 xfs_trans_set_sync(tp);
4651 4650
4652 error = xfs_trans_commit(tp, 0, NULL); 4651 error = xfs_trans_commit(tp, 0);
4653 4652
4654 xfs_iunlock(ip, XFS_ILOCK_EXCL); 4653 xfs_iunlock(ip, XFS_ILOCK_EXCL);
4655 4654