[BACK]Return to xfs_log_priv.h CVS log [TXT] [DIR] Up to [OSS] / xfs-linux

Diff for /xfs-linux/xfs_log_priv.h between versions 1.122 and 1.123

version 1.122, 2007/09/21 04:11:08 version 1.123, 2007/10/02 06:14:02
Line 55  struct xfs_mount; Line 55  struct xfs_mount;
         BTOBB(XLOG_MAX_ICLOGS << (XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb) ? \          BTOBB(XLOG_MAX_ICLOGS << (XFS_SB_VERSION_HASLOGV2(&log->l_mp->m_sb) ? \
          XLOG_MAX_RECORD_BSHIFT : XLOG_BIG_RECORD_BSHIFT))           XLOG_MAX_RECORD_BSHIFT : XLOG_BIG_RECORD_BSHIFT))
   
 /*  
  *  set lsns  
  */  
   
 #define ASSIGN_ANY_LSN_HOST(lsn,cycle,block)  \  static inline xfs_lsn_t xlog_assign_lsn(uint cycle, uint block)
     { \  {
         (lsn) = ((xfs_lsn_t)(cycle)<<32)|(block); \          return ((xfs_lsn_t)cycle << 32) | block;
     }  }
 #define ASSIGN_ANY_LSN_DISK(lsn,cycle,block)  \  
     { \  static inline uint xlog_get_cycle(char *ptr)
         INT_SET(((uint *)&(lsn))[0], ARCH_CONVERT, (cycle)); \  {
         INT_SET(((uint *)&(lsn))[1], ARCH_CONVERT, (block)); \          if (INT_GET(*(uint *)ptr, ARCH_CONVERT) == XLOG_HEADER_MAGIC_NUM)
     }                  return INT_GET(*((uint *)ptr + 1), ARCH_CONVERT);
 #define ASSIGN_LSN(lsn,log) \          else
     ASSIGN_ANY_LSN_DISK(lsn,(log)->l_curr_cycle,(log)->l_curr_block);                  return INT_GET(*(uint *)ptr, ARCH_CONVERT);
   }
 #define XLOG_SET(f,b)           (((f) & (b)) == (b))  
   
 #define GET_CYCLE(ptr, arch) \  
     (INT_GET(*(uint *)(ptr), arch) == XLOG_HEADER_MAGIC_NUM ? \  
          INT_GET(*((uint *)(ptr)+1), arch) : \  
          INT_GET(*(uint *)(ptr), arch) \  
     )  
   
 #define BLK_AVG(blk1, blk2)     ((blk1+blk2) >> 1)  #define BLK_AVG(blk1, blk2)     ((blk1+blk2) >> 1)
   
   
 #ifdef __KERNEL__  #ifdef __KERNEL__
   
 /*  /*
Line 96  struct xfs_mount; Line 85  struct xfs_mount;
  *   *
  * this has endian issues, of course.   * this has endian issues, of course.
  */   */
   static inline uint xlog_get_client_id(uint i)
 #ifndef XFS_NATIVE_HOST  {
 #define GET_CLIENT_ID(i,arch) \          return INT_GET(i, ARCH_CONVERT) >> 24;
     ((i) & 0xff)  }
 #else  
 #define GET_CLIENT_ID(i,arch) \  
     ((i) >> 24)  
 #endif  
   
 #define xlog_panic(args...)     cmn_err(CE_PANIC, ## args)  #define xlog_panic(args...)     cmn_err(CE_PANIC, ## args)
 #define xlog_exit(args...)      cmn_err(CE_PANIC, ## args)  #define xlog_exit(args...)      cmn_err(CE_PANIC, ## args)
Removed from v.1.122  
changed lines
  Added in v.1.123

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>