aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log_recover.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
-rw-r--r--fs/xfs/xfs_log_recover.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index e603591b9922..f27b6e93a682 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2916,7 +2916,7 @@ xlog_recover_process_data(
2916 ASSERT(0); 2916 ASSERT(0);
2917 return (XFS_ERROR(EIO)); 2917 return (XFS_ERROR(EIO));
2918 } 2918 }
2919 tid = INT_GET(ohead->oh_tid, ARCH_CONVERT); 2919 tid = be32_to_cpu(ohead->oh_tid);
2920 hash = XLOG_RHASH(tid); 2920 hash = XLOG_RHASH(tid);
2921 trans = xlog_recover_find_tid(rhash[hash], tid); 2921 trans = xlog_recover_find_tid(rhash[hash], tid);
2922 if (trans == NULL) { /* not found; add new tid */ 2922 if (trans == NULL) { /* not found; add new tid */
@@ -2924,7 +2924,7 @@ xlog_recover_process_data(
2924 xlog_recover_new_tid(&rhash[hash], tid, 2924 xlog_recover_new_tid(&rhash[hash], tid,
2925 INT_GET(rhead->h_lsn, ARCH_CONVERT)); 2925 INT_GET(rhead->h_lsn, ARCH_CONVERT));
2926 } else { 2926 } else {
2927 ASSERT(dp+INT_GET(ohead->oh_len, ARCH_CONVERT) <= lp); 2927 ASSERT(dp + be32_to_cpu(ohead->oh_len) <= lp);
2928 flags = ohead->oh_flags & ~XLOG_END_TRANS; 2928 flags = ohead->oh_flags & ~XLOG_END_TRANS;
2929 if (flags & XLOG_WAS_CONT_TRANS) 2929 if (flags & XLOG_WAS_CONT_TRANS)
2930 flags &= ~XLOG_CONTINUE_TRANS; 2930 flags &= ~XLOG_CONTINUE_TRANS;
@@ -2938,8 +2938,7 @@ xlog_recover_process_data(
2938 break; 2938 break;
2939 case XLOG_WAS_CONT_TRANS: 2939 case XLOG_WAS_CONT_TRANS:
2940 error = xlog_recover_add_to_cont_trans(trans, 2940 error = xlog_recover_add_to_cont_trans(trans,
2941 dp, INT_GET(ohead->oh_len, 2941 dp, be32_to_cpu(ohead->oh_len));
2942 ARCH_CONVERT));
2943 break; 2942 break;
2944 case XLOG_START_TRANS: 2943 case XLOG_START_TRANS:
2945 xlog_warn( 2944 xlog_warn(
@@ -2950,8 +2949,7 @@ xlog_recover_process_data(
2950 case 0: 2949 case 0:
2951 case XLOG_CONTINUE_TRANS: 2950 case XLOG_CONTINUE_TRANS:
2952 error = xlog_recover_add_to_trans(trans, 2951 error = xlog_recover_add_to_trans(trans,
2953 dp, INT_GET(ohead->oh_len, 2952 dp, be32_to_cpu(ohead->oh_len));
2954 ARCH_CONVERT));
2955 break; 2953 break;
2956 default: 2954 default:
2957 xlog_warn( 2955 xlog_warn(
@@ -2963,7 +2961,7 @@ xlog_recover_process_data(
2963 if (error) 2961 if (error)
2964 return error; 2962 return error;
2965 } 2963 }
2966 dp += INT_GET(ohead->oh_len, ARCH_CONVERT); 2964 dp += be32_to_cpu(ohead->oh_len);
2967 num_logops--; 2965 num_logops--;
2968 } 2966 }
2969 return 0; 2967 return 0;