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

Diff for /xfs-linux/xfs_log.c between versions 1.339 and 1.340

version 1.339, 2007/09/21 16:09:12 version 1.340, 2007/10/02 06:14:02
Line 1161  xlog_alloc_log(xfs_mount_t *mp, Line 1161  xlog_alloc_log(xfs_mount_t *mp,
         log->l_flags       |= XLOG_ACTIVE_RECOVERY;          log->l_flags       |= XLOG_ACTIVE_RECOVERY;
   
         log->l_prev_block  = -1;          log->l_prev_block  = -1;
         ASSIGN_ANY_LSN_HOST(log->l_tail_lsn, 1, 0);          log->l_tail_lsn    = xlog_assign_lsn(1, 0);
         /* log->l_tail_lsn = 0x100000000LL; cycle = 1; current block = 0 */          /* log->l_tail_lsn = 0x100000000LL; cycle = 1; current block = 0 */
         log->l_last_sync_lsn = log->l_tail_lsn;          log->l_last_sync_lsn = log->l_tail_lsn;
         log->l_curr_cycle  = 1;     /* 0 is bad since this is initial value */          log->l_curr_cycle  = 1;     /* 0 is bad since this is initial value */
Line 1326  xlog_grant_push_ail(xfs_mount_t *mp, Line 1326  xlog_grant_push_ail(xfs_mount_t *mp,
             threshold_block -= log->l_logBBsize;              threshold_block -= log->l_logBBsize;
             threshold_cycle += 1;              threshold_cycle += 1;
         }          }
         ASSIGN_ANY_LSN_HOST(threshold_lsn, threshold_cycle,          threshold_lsn = xlog_assign_lsn(threshold_cycle, threshold_block);
                        threshold_block);  
   
         /* Don't pass in an lsn greater than the lsn of the last          /* Don't pass in an lsn greater than the lsn of the last
          * log record known to be on disk.           * log record known to be on disk.
Line 2393  restart: Line 2392  restart:
                                     log->l_iclog_hsize,                                      log->l_iclog_hsize,
                                     XLOG_REG_TYPE_LRHEADER);                                      XLOG_REG_TYPE_LRHEADER);
                 INT_SET(head->h_cycle, ARCH_CONVERT, log->l_curr_cycle);                  INT_SET(head->h_cycle, ARCH_CONVERT, log->l_curr_cycle);
                 ASSIGN_LSN(head->h_lsn, log);                  INT_SET(head->h_lsn, ARCH_CONVERT,
                           xlog_assign_lsn(log->l_curr_cycle, log->l_curr_block));
                 ASSERT(log->l_curr_block >= 0);                  ASSERT(log->l_curr_block >= 0);
         }          }
   
Line 3488  xlog_verify_iclog(xlog_t  *log, Line 3488  xlog_verify_iclog(xlog_t  *log,
                         if (idx >= (XLOG_HEADER_CYCLE_SIZE / BBSIZE)) {                          if (idx >= (XLOG_HEADER_CYCLE_SIZE / BBSIZE)) {
                                 j = idx / (XLOG_HEADER_CYCLE_SIZE / BBSIZE);                                  j = idx / (XLOG_HEADER_CYCLE_SIZE / BBSIZE);
                                 k = idx % (XLOG_HEADER_CYCLE_SIZE / BBSIZE);                                  k = idx % (XLOG_HEADER_CYCLE_SIZE / BBSIZE);
                                 clientid = GET_CLIENT_ID(xhdr[j].hic_xheader.xh_cycle_data[k], ARCH_CONVERT);                                  clientid = xlog_get_client_id(
                                           xhdr[j].hic_xheader.xh_cycle_data[k]);
                         } else {                          } else {
                                 clientid = GET_CLIENT_ID(iclog->ic_header.h_cycle_data[idx], ARCH_CONVERT);                                  clientid = xlog_get_client_id(
                                           iclog->ic_header.h_cycle_data[idx]);
                         }                          }
                 }                  }
                 if (clientid != XFS_TRANSACTION && clientid != XFS_LOG)                  if (clientid != XFS_TRANSACTION && clientid != XFS_LOG)
Removed from v.1.339  
changed lines
  Added in v.1.340

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