Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 18157
b: refs/heads/master
c: 65be605
h: refs/heads/master
i:
  18155: 257d5db
v: v3
  • Loading branch information
Eric Sandeen authored and Nathan Scott committed Jan 11, 2006
1 parent c5f698a commit 1c4cc69
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0d14824c0774d050cb4232e1e470e5fc9e32e587
refs/heads/master: 65be60541909c7bf8c384cde3502c18cc362939e
2 changes: 1 addition & 1 deletion trunk/fs/xfs/xfs_log.c
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ xfs_log_mount(xfs_mount_t *mp,
if (readonly)
vfsp->vfs_flag &= ~VFS_RDONLY;

error = xlog_recover(mp->m_log, readonly);
error = xlog_recover(mp->m_log);

if (readonly)
vfsp->vfs_flag |= VFS_RDONLY;
Expand Down
5 changes: 2 additions & 3 deletions trunk/fs/xfs/xfs_log_priv.h
Original file line number Diff line number Diff line change
Expand Up @@ -556,9 +556,8 @@ typedef struct log {
extern xfs_lsn_t xlog_assign_tail_lsn(struct xfs_mount *mp);
extern int xlog_find_tail(xlog_t *log,
xfs_daddr_t *head_blk,
xfs_daddr_t *tail_blk,
int readonly);
extern int xlog_recover(xlog_t *log, int readonly);
xfs_daddr_t *tail_blk);
extern int xlog_recover(xlog_t *log);
extern int xlog_recover_finish(xlog_t *log, int mfsi_flags);
extern void xlog_pack_data(xlog_t *log, xlog_in_core_t *iclog, int);
extern void xlog_recover_process_iunlinks(xlog_t *log);
Expand Down
8 changes: 3 additions & 5 deletions trunk/fs/xfs/xfs_log_recover.c
Original file line number Diff line number Diff line change
Expand Up @@ -783,8 +783,7 @@ int
xlog_find_tail(
xlog_t *log,
xfs_daddr_t *head_blk,
xfs_daddr_t *tail_blk,
int readonly)
xfs_daddr_t *tail_blk)
{
xlog_rec_header_t *rhead;
xlog_op_header_t *op_head;
Expand Down Expand Up @@ -3890,14 +3889,13 @@ xlog_do_recover(
*/
int
xlog_recover(
xlog_t *log,
int readonly)
xlog_t *log)
{
xfs_daddr_t head_blk, tail_blk;
int error;

/* find the tail of the log */
if ((error = xlog_find_tail(log, &head_blk, &tail_blk, readonly)))
if ((error = xlog_find_tail(log, &head_blk, &tail_blk)))
return error;

if (tail_blk != head_blk) {
Expand Down

0 comments on commit 1c4cc69

Please sign in to comment.