Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 339448
b: refs/heads/master
c: f9668a0
h: refs/heads/master
v: v3
  • Loading branch information
Dave Chinner authored and Ben Myers committed Dec 3, 2012
1 parent 648d036 commit 465d3bd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 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: b870553cdecb26d5291af09602352b763e323df2
refs/heads/master: f9668a09e32ac6d2aa22f44cc310e430a8f4a40f
2 changes: 1 addition & 1 deletion trunk/fs/xfs/xfs_log.c
Original file line number Diff line number Diff line change
Expand Up @@ -1538,7 +1538,7 @@ xlog_pack_data(
* This is a little more complicated than it should be because the various
* headers and the actual data are non-contiguous.
*/
__be32
__le32
xlog_cksum(
struct xlog *log,
struct xlog_rec_header *rhead,
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/xfs/xfs_log_priv.h
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ extern int
xlog_recover_finish(
struct xlog *log);

extern __be32 xlog_cksum(struct xlog *log, struct xlog_rec_header *rhead,
extern __le32 xlog_cksum(struct xlog *log, struct xlog_rec_header *rhead,
char *dp, int size);

extern kmem_zone_t *xfs_log_ticket_zone;
Expand Down
6 changes: 3 additions & 3 deletions trunk/fs/xfs/xfs_log_recover.c
Original file line number Diff line number Diff line change
Expand Up @@ -3233,15 +3233,15 @@ xlog_unpack_data_crc(
xfs_caddr_t dp,
struct xlog *log)
{
__be32 crc;
__le32 crc;

crc = xlog_cksum(log, rhead, dp, be32_to_cpu(rhead->h_len));
if (crc != rhead->h_crc) {
if (rhead->h_crc || xfs_sb_version_hascrc(&log->l_mp->m_sb)) {
xfs_alert(log->l_mp,
"log record CRC mismatch: found 0x%x, expected 0x%x.\n",
be32_to_cpu(rhead->h_crc),
be32_to_cpu(crc));
le32_to_cpu(rhead->h_crc),
le32_to_cpu(crc));
xfs_hex_dump(dp, 32);
}

Expand Down

0 comments on commit 465d3bd

Please sign in to comment.