Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Dec 2009 17:12:43 +0000 (09:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Dec 2009 17:12:43 +0000 (09:12 -0800)
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: event tracing support
  xfs: change the xfs_iext_insert / xfs_iext_remove
  xfs: cleanup bmap extent state macros

1  2 
fs/xfs/xfs_log_recover.c

diff --combined fs/xfs/xfs_log_recover.c
index 9d4fdcaf897f80a5cd2b9ba17fa5deff60abba81,abc2034d83ea69913b659b7bfa9951c9502ab35a..69ac2e5ef20c6197d0ef47225ddeda77897e1743
@@@ -46,6 -46,7 +46,7 @@@
  #include "xfs_quota.h"
  #include "xfs_rw.h"
  #include "xfs_utils.h"
+ #include "xfs_trace.h"
  
  STATIC int    xlog_find_zeroed(xlog_t *, xfs_daddr_t *);
  STATIC int    xlog_clear_stale_blocks(xlog_t *, xfs_lsn_t);
@@@ -225,10 -226,16 +226,10 @@@ xlog_header_check_dump
        xfs_mount_t             *mp,
        xlog_rec_header_t       *head)
  {
 -      int                     b;
 -
 -      cmn_err(CE_DEBUG, "%s:  SB : uuid = ", __func__);
 -      for (b = 0; b < 16; b++)
 -              cmn_err(CE_DEBUG, "%02x", ((__uint8_t *)&mp->m_sb.sb_uuid)[b]);
 -      cmn_err(CE_DEBUG, ", fmt = %d\n", XLOG_FMT);
 -      cmn_err(CE_DEBUG, "    log : uuid = ");
 -      for (b = 0; b < 16; b++)
 -              cmn_err(CE_DEBUG, "%02x", ((__uint8_t *)&head->h_fs_uuid)[b]);
 -      cmn_err(CE_DEBUG, ", fmt = %d\n", be32_to_cpu(head->h_fmt));
 +      cmn_err(CE_DEBUG, "%s:  SB : uuid = %pU, fmt = %d\n",
 +              __func__, &mp->m_sb.sb_uuid, XLOG_FMT);
 +      cmn_err(CE_DEBUG, "    log : uuid = %pU, fmt = %d\n",
 +              &head->h_fs_uuid, be32_to_cpu(head->h_fmt));
  }
  #else
  #define xlog_header_check_dump(mp, head)