diff options
Diffstat (limited to 'fs/xfs/xfs_log.c')
-rw-r--r-- | fs/xfs/xfs_log.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 90d96caf7200..5ff4643b72c7 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c | |||
@@ -1829,7 +1829,7 @@ xlog_write(xfs_mount_t * mp, | |||
1829 | */ | 1829 | */ |
1830 | if (ticket->t_flags & XLOG_TIC_INITED) { | 1830 | if (ticket->t_flags & XLOG_TIC_INITED) { |
1831 | logop_head = (xlog_op_header_t *)ptr; | 1831 | logop_head = (xlog_op_header_t *)ptr; |
1832 | INT_SET(logop_head->oh_tid, ARCH_CONVERT, ticket->t_tid); | 1832 | logop_head->oh_tid = cpu_to_be32(ticket->t_tid); |
1833 | logop_head->oh_clientid = ticket->t_clientid; | 1833 | logop_head->oh_clientid = ticket->t_clientid; |
1834 | logop_head->oh_len = 0; | 1834 | logop_head->oh_len = 0; |
1835 | logop_head->oh_flags = XLOG_START_TRANS; | 1835 | logop_head->oh_flags = XLOG_START_TRANS; |
@@ -1843,7 +1843,7 @@ xlog_write(xfs_mount_t * mp, | |||
1843 | 1843 | ||
1844 | /* Copy log operation header directly into data section */ | 1844 | /* Copy log operation header directly into data section */ |
1845 | logop_head = (xlog_op_header_t *)ptr; | 1845 | logop_head = (xlog_op_header_t *)ptr; |
1846 | INT_SET(logop_head->oh_tid, ARCH_CONVERT, ticket->t_tid); | 1846 | logop_head->oh_tid = cpu_to_be32(ticket->t_tid); |
1847 | logop_head->oh_clientid = ticket->t_clientid; | 1847 | logop_head->oh_clientid = ticket->t_clientid; |
1848 | logop_head->oh_res2 = 0; | 1848 | logop_head->oh_res2 = 0; |
1849 | 1849 | ||
@@ -1878,13 +1878,14 @@ xlog_write(xfs_mount_t * mp, | |||
1878 | 1878 | ||
1879 | copy_off = partial_copy_len; | 1879 | copy_off = partial_copy_len; |
1880 | if (need_copy <= iclog->ic_size - log_offset) { /*complete write */ | 1880 | if (need_copy <= iclog->ic_size - log_offset) { /*complete write */ |
1881 | INT_SET(logop_head->oh_len, ARCH_CONVERT, copy_len = need_copy); | 1881 | copy_len = need_copy; |
1882 | logop_head->oh_len = cpu_to_be32(copy_len); | ||
1882 | if (partial_copy) | 1883 | if (partial_copy) |
1883 | logop_head->oh_flags|= (XLOG_END_TRANS|XLOG_WAS_CONT_TRANS); | 1884 | logop_head->oh_flags|= (XLOG_END_TRANS|XLOG_WAS_CONT_TRANS); |
1884 | partial_copy_len = partial_copy = 0; | 1885 | partial_copy_len = partial_copy = 0; |
1885 | } else { /* partial write */ | 1886 | } else { /* partial write */ |
1886 | copy_len = iclog->ic_size - log_offset; | 1887 | copy_len = iclog->ic_size - log_offset; |
1887 | INT_SET(logop_head->oh_len, ARCH_CONVERT, copy_len); | 1888 | logop_head->oh_len = cpu_to_be32(copy_len); |
1888 | logop_head->oh_flags |= XLOG_CONTINUE_TRANS; | 1889 | logop_head->oh_flags |= XLOG_CONTINUE_TRANS; |
1889 | if (partial_copy) | 1890 | if (partial_copy) |
1890 | logop_head->oh_flags |= XLOG_WAS_CONT_TRANS; | 1891 | logop_head->oh_flags |= XLOG_WAS_CONT_TRANS; |
@@ -3504,7 +3505,7 @@ xlog_verify_iclog(xlog_t *log, | |||
3504 | field_offset = (__psint_t) | 3505 | field_offset = (__psint_t) |
3505 | ((xfs_caddr_t)&(ophead->oh_len) - base_ptr); | 3506 | ((xfs_caddr_t)&(ophead->oh_len) - base_ptr); |
3506 | if (syncing == B_FALSE || (field_offset & 0x1ff)) { | 3507 | if (syncing == B_FALSE || (field_offset & 0x1ff)) { |
3507 | op_len = INT_GET(ophead->oh_len, ARCH_CONVERT); | 3508 | op_len = be32_to_cpu(ophead->oh_len); |
3508 | } else { | 3509 | } else { |
3509 | idx = BTOBBT((__psint_t)&ophead->oh_len - | 3510 | idx = BTOBBT((__psint_t)&ophead->oh_len - |
3510 | (__psint_t)iclog->ic_datap); | 3511 | (__psint_t)iclog->ic_datap); |