projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xfs: saner xfs_trans_commit interface
[deliverable/linux.git]
/
fs
/
xfs
/
xfs_log_recover.c
diff --git
a/fs/xfs/xfs_log_recover.c
b/fs/xfs/xfs_log_recover.c
index a5a945fc3bdc700e218c15f3d9511e9d390cba8f..599de7248e215e92f68dcd328bd1d39b4f428893 100644
(file)
--- a/
fs/xfs/xfs_log_recover.c
+++ b/
fs/xfs/xfs_log_recover.c
@@
-3751,11
+3751,11
@@
xlog_recover_process_efi(
}
set_bit(XFS_EFI_RECOVERED, &efip->efi_flags);
}
set_bit(XFS_EFI_RECOVERED, &efip->efi_flags);
- error = xfs_trans_commit(tp
, 0
);
+ error = xfs_trans_commit(tp);
return error;
abort_error:
return error;
abort_error:
- xfs_trans_cancel(tp
, XFS_TRANS_ABORT
);
+ xfs_trans_cancel(tp);
return error;
}
return error;
}
@@
-3857,13
+3857,13
@@
xlog_recover_clear_agi_bucket(
xfs_trans_log_buf(tp, agibp, offset,
(offset + sizeof(xfs_agino_t) - 1));
xfs_trans_log_buf(tp, agibp, offset,
(offset + sizeof(xfs_agino_t) - 1));
- error = xfs_trans_commit(tp
, 0
);
+ error = xfs_trans_commit(tp);
if (error)
goto out_error;
return;
out_abort:
if (error)
goto out_error;
return;
out_abort:
- xfs_trans_cancel(tp
, XFS_TRANS_ABORT
);
+ xfs_trans_cancel(tp);
out_error:
xfs_warn(mp, "%s: failed to clear agi %d. Continuing.", __func__, agno);
return;
out_error:
xfs_warn(mp, "%s: failed to clear agi %d. Continuing.", __func__, agno);
return;
@@
-4463,10
+4463,10
@@
xlog_do_recover(
xfs_sb_from_disk(sbp, XFS_BUF_TO_SBP(bp));
ASSERT(sbp->sb_magicnum == XFS_SB_MAGIC);
ASSERT(xfs_sb_good_version(sbp));
xfs_sb_from_disk(sbp, XFS_BUF_TO_SBP(bp));
ASSERT(sbp->sb_magicnum == XFS_SB_MAGIC);
ASSERT(xfs_sb_good_version(sbp));
+ xfs_reinit_percpu_counters(log->l_mp);
+
xfs_buf_relse(bp);
xfs_buf_relse(bp);
- /* We've re-read the superblock so re-initialize per-cpu counters */
- xfs_icsb_reinit_counters(log->l_mp);
xlog_recover_check_summary(log);
xlog_recover_check_summary(log);
This page took
0.029322 seconds
and
5
git commands to generate.