diff options
| -rw-r--r-- | fs/xfs/xfs_log.c | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_log_priv.h | 5 | ||||
| -rw-r--r-- | fs/xfs/xfs_log_recover.c | 8 |
3 files changed, 6 insertions, 9 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 29af51275ca9..ecb1067494f0 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c | |||
| @@ -428,7 +428,7 @@ xfs_log_mount(xfs_mount_t *mp, | |||
| 428 | if (readonly) | 428 | if (readonly) |
| 429 | vfsp->vfs_flag &= ~VFS_RDONLY; | 429 | vfsp->vfs_flag &= ~VFS_RDONLY; |
| 430 | 430 | ||
| 431 | error = xlog_recover(mp->m_log, readonly); | 431 | error = xlog_recover(mp->m_log); |
| 432 | 432 | ||
| 433 | if (readonly) | 433 | if (readonly) |
| 434 | vfsp->vfs_flag |= VFS_RDONLY; | 434 | vfsp->vfs_flag |= VFS_RDONLY; |
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h index 4518b188ade6..4f93988d7ac6 100644 --- a/fs/xfs/xfs_log_priv.h +++ b/fs/xfs/xfs_log_priv.h | |||
| @@ -556,9 +556,8 @@ typedef struct log { | |||
| 556 | extern xfs_lsn_t xlog_assign_tail_lsn(struct xfs_mount *mp); | 556 | extern xfs_lsn_t xlog_assign_tail_lsn(struct xfs_mount *mp); |
| 557 | extern int xlog_find_tail(xlog_t *log, | 557 | extern int xlog_find_tail(xlog_t *log, |
| 558 | xfs_daddr_t *head_blk, | 558 | xfs_daddr_t *head_blk, |
| 559 | xfs_daddr_t *tail_blk, | 559 | xfs_daddr_t *tail_blk); |
| 560 | int readonly); | 560 | extern int xlog_recover(xlog_t *log); |
| 561 | extern int xlog_recover(xlog_t *log, int readonly); | ||
| 562 | extern int xlog_recover_finish(xlog_t *log, int mfsi_flags); | 561 | extern int xlog_recover_finish(xlog_t *log, int mfsi_flags); |
| 563 | extern void xlog_pack_data(xlog_t *log, xlog_in_core_t *iclog, int); | 562 | extern void xlog_pack_data(xlog_t *log, xlog_in_core_t *iclog, int); |
| 564 | extern void xlog_recover_process_iunlinks(xlog_t *log); | 563 | extern void xlog_recover_process_iunlinks(xlog_t *log); |
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 8ab7df768063..d0c9fc4fed60 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c | |||
| @@ -783,8 +783,7 @@ int | |||
| 783 | xlog_find_tail( | 783 | xlog_find_tail( |
| 784 | xlog_t *log, | 784 | xlog_t *log, |
| 785 | xfs_daddr_t *head_blk, | 785 | xfs_daddr_t *head_blk, |
| 786 | xfs_daddr_t *tail_blk, | 786 | xfs_daddr_t *tail_blk) |
| 787 | int readonly) | ||
| 788 | { | 787 | { |
| 789 | xlog_rec_header_t *rhead; | 788 | xlog_rec_header_t *rhead; |
| 790 | xlog_op_header_t *op_head; | 789 | xlog_op_header_t *op_head; |
| @@ -3890,14 +3889,13 @@ xlog_do_recover( | |||
| 3890 | */ | 3889 | */ |
| 3891 | int | 3890 | int |
| 3892 | xlog_recover( | 3891 | xlog_recover( |
| 3893 | xlog_t *log, | 3892 | xlog_t *log) |
| 3894 | int readonly) | ||
| 3895 | { | 3893 | { |
| 3896 | xfs_daddr_t head_blk, tail_blk; | 3894 | xfs_daddr_t head_blk, tail_blk; |
| 3897 | int error; | 3895 | int error; |
| 3898 | 3896 | ||
| 3899 | /* find the tail of the log */ | 3897 | /* find the tail of the log */ |
| 3900 | if ((error = xlog_find_tail(log, &head_blk, &tail_blk, readonly))) | 3898 | if ((error = xlog_find_tail(log, &head_blk, &tail_blk))) |
| 3901 | return error; | 3899 | return error; |
| 3902 | 3900 | ||
| 3903 | if (tail_blk != head_blk) { | 3901 | if (tail_blk != head_blk) { |
