[DRBD-cvs] svn commit by lars - r2556 - trunk/drbd - get some
consistency at the various places we print sec
drbd-cvs at lists.linbit.com
drbd-cvs at lists.linbit.com
Mon Oct 23 16:05:10 CEST 2006
Author: lars
Date: 2006-10-23 16:05:07 +0200 (Mon, 23 Oct 2006)
New Revision: 2556
Modified:
trunk/drbd/drbd_actlog.c
trunk/drbd/drbd_bitmap.c
trunk/drbd/drbd_main.c
trunk/drbd/drbd_receiver.c
trunk/drbd/drbd_req.c
trunk/drbd/drbd_req.h
trunk/drbd/drbd_worker.c
Log:
get some consistency at the various places we print sector numbers.
we decided to have it in decimal, prefixed with 's'.
Modified: trunk/drbd/drbd_actlog.c
===================================================================
--- trunk/drbd/drbd_actlog.c 2006-10-23 08:58:47 UTC (rev 2555)
+++ trunk/drbd/drbd_actlog.c 2006-10-23 14:05:07 UTC (rev 2556)
@@ -115,7 +115,7 @@
sector,READ,hardsect);
if (unlikely(!ok)) {
- ERR("drbd_md_sync_page_io(,%llu,READ [hardsect!=512]) failed!\n",
+ ERR("drbd_md_sync_page_io(,%llus,READ [hardsect!=512]) failed!\n",
(unsigned long long)sector);
return 0;
}
@@ -125,20 +125,20 @@
}
#if DUMP_MD >= 3
- INFO("%s [%d]:%s(,%llu,%s)\n",
+ INFO("%s [%d]:%s(,%llus,%s)\n",
current->comm, current->pid, __func__,
(unsigned long long)sector, rw ? "WRITE" : "READ");
#endif
if (sector < drbd_md_first_sector(bdev) || sector > drbd_md_last_sector(bdev)) {
- ALERT("%s [%d]:%s(,%llu,%s) out of range md access!\n",
+ ALERT("%s [%d]:%s(,%llus,%s) out of range md access!\n",
current->comm, current->pid, __func__,
(unsigned long long)sector, rw ? "WRITE" : "READ");
}
ok = _drbd_md_sync_page_io(bdev,iop,sector,rw,hardsect);
if (unlikely(!ok)) {
- ERR("drbd_md_sync_page_io(,%llu,%s) failed!\n",
+ ERR("drbd_md_sync_page_io(,%llus,%s) failed!\n",
(unsigned long long)sector,rw ? "WRITE" : "READ");
return 0;
}
@@ -608,7 +608,6 @@
if(drbd_bm_total_weight(mdev) <= mdev->rs_failed &&
( mdev->state.conn == SyncSource || mdev->state.conn == SyncTarget ||
mdev->state.conn == PausedSyncS || mdev->state.conn == PausedSyncT ) ) {
- D_ASSERT( mdev->resync_work.cb == w_resync_inactive );
drbd_bm_lock(mdev);
drbd_resync_finished(mdev);
drbd_bm_unlock(mdev);
@@ -645,7 +644,7 @@
else
ext->rs_failed += count;
if (ext->rs_left < ext->rs_failed) {
- ERR("BAD! sector=%llu enr=%u rs_left=%d rs_failed=%d count=%d\n",
+ ERR("BAD! sector=%llus enr=%u rs_left=%d rs_failed=%d count=%d\n",
(unsigned long long)sector,
ext->lce.lc_number, ext->rs_left, ext->rs_failed, count);
dump_stack();
@@ -719,8 +718,8 @@
unsigned long flags;
if (size <= 0 || (size & 0x1ff) != 0 || size > DRBD_MAX_SEGMENT_SIZE) {
- ERR("drbd_set_in_sync: sector=%lu size=%d nonsense!\n",
- (unsigned long)sector,size);
+ ERR("drbd_set_in_sync: sector=%llus size=%d nonsense!\n",
+ (unsigned long long)sector,size);
return;
}
nr_sectors = drbd_get_capacity(mdev->this_bdev);
@@ -744,8 +743,8 @@
sbnr = BM_SECT_TO_BIT(sector + BM_SECT_PER_BIT-1);
MTRACE(TraceTypeResync, TraceLvlMetrics,
- INFO("drbd_set_in_sync: sector=%llx size=%x sbnr=%lx ebnr=%lx\n",
- (long long)sector, size, sbnr, ebnr);
+ INFO("drbd_set_in_sync: sector=%llus size=%u sbnr=%lu ebnr=%lu\n",
+ (unsigned long long)sector, size, sbnr, ebnr);
);
if (sbnr > ebnr) return;
@@ -788,7 +787,7 @@
unsigned long sbnr,ebnr,lbnr;
sector_t esector, nr_sectors;
- /* Find codepoints that call set_out_of_sync()
+ /* Find codepoints that call set_out_of_sync()
unsigned long flags;
unsigned int enr;
struct bm_extent* ext;
@@ -807,7 +806,7 @@
*/
if (size <= 0 || (size & 0x1ff) != 0 || size > DRBD_MAX_SEGMENT_SIZE) {
- ERR("sector: %lu, size: %d\n",(unsigned long)sector,size);
+ ERR("sector: %llus, size: %d\n",(unsigned long long)sector,size);
return;
}
@@ -825,8 +824,8 @@
ebnr = BM_SECT_TO_BIT(esector);
MTRACE(TraceTypeResync, TraceLvlMetrics,
- INFO("drbd_set_out_of_sync: sector=%llx size=%x sbnr=%lx ebnr=%lx\n",
- (long long)sector, size, sbnr, ebnr);
+ INFO("drbd_set_out_of_sync: sector=%llus size=%u sbnr=%lu ebnr=%lu\n",
+ (unsigned long long)sector, size, sbnr, ebnr);
);
/* ok, (capacity & 7) != 0 sometimes, but who cares...
@@ -915,8 +914,8 @@
int i, sig;
MTRACE(TraceTypeResync, TraceLvlAll,
- INFO("drbd_rs_begin_io: sector=%llx\n",
- (long long)sector);
+ INFO("drbd_rs_begin_io: sector=%llus\n",
+ (unsigned long long)sector);
);
sig = wait_event_interruptible( mdev->al_wait,
@@ -1058,7 +1057,7 @@
unsigned long flags;
MTRACE(TraceTypeResync, TraceLvlAll,
- INFO("drbd_rs_complete_io: sector=%llx\n",
+ INFO("drbd_rs_complete_io: sector=%llus\n",
(long long)sector);
);
@@ -1116,6 +1115,8 @@
/**
* drbd_rs_del_all: Gracefully remove all extents from the resync LRU.
+ * there may be still a reference hold by w_make_resync_request
+ * (drbd_try_rs_begin_io). we lc_del that here anyways...
*/
void drbd_rs_del_all(drbd_dev* mdev)
{
@@ -1158,13 +1159,13 @@
int wake_up=0;
MTRACE(TraceTypeResync, TraceLvlSummary,
- INFO("drbd_rs_failed_io: sector=%llx, size=%x\n",
- (long long)sector,size);
+ INFO("drbd_rs_failed_io: sector=%llus, size=%u\n",
+ (unsigned long long)sector,size);
);
if (size <= 0 || (size & 0x1ff) != 0 || size > DRBD_MAX_SEGMENT_SIZE) {
- ERR("drbd_rs_failed_io: sector=%lu size=%d nonsense!\n",
- (unsigned long)sector,size);
+ ERR("drbd_rs_failed_io: sector=%llus size=%d nonsense!\n",
+ (unsigned long long)sector,size);
return;
}
nr_sectors = drbd_get_capacity(mdev->this_bdev);
Modified: trunk/drbd/drbd_bitmap.c
===================================================================
--- trunk/drbd/drbd_bitmap.c 2006-10-23 08:58:47 UTC (rev 2555)
+++ trunk/drbd/drbd_bitmap.c 2006-10-23 14:05:07 UTC (rev 2556)
@@ -355,7 +355,8 @@
down(&b->bm_change);
}
- INFO("drbd_bm_resize called with capacity == %llu\n", (unsigned long long)capacity);
+ INFO("drbd_bm_resize called with capacity == %llu\n",
+ (unsigned long long)capacity);
if (capacity == b->bm_dev_capacity)
goto out;
@@ -679,7 +680,7 @@
offset = S2W(enr); // word offset into bitmap
num_words = min(S2W(1), bm_words - offset);
#if DUMP_MD >= 3
- INFO("read_sect: sector=%lu offset=%u num_words=%u\n",
+ INFO("read_sect: sector=%lus offset=%u num_words=%u\n",
enr, offset, num_words);
#endif
drbd_bm_set_lel( mdev, offset, num_words,
@@ -787,7 +788,7 @@
} else /* rw == READ */ {
/* just read, if neccessary adjust endianness */
b->bm_set = bm_count_bits(b, 1);
- INFO("recounting of set bits took additional %lu jiffies\n",
+ INFO("recounting of set bits took additional %lu jiffies\n",
jiffies - now);
}
@@ -850,8 +851,8 @@
int i;
err = -EIO;
ERR( "IO ERROR writing bitmap sector %lu "
- "(meta-disk sector %lu)\n",
- enr, (unsigned long)on_disk_sector );
+ "(meta-disk sector %llus)\n",
+ enr, (unsigned long long)on_disk_sector );
drbd_chk_io_error(mdev, 1, TRUE);
drbd_io_error(mdev, TRUE);
for (i = 0; i < AL_EXT_PER_BM_SECT; i++)
Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c 2006-10-23 08:58:47 UTC (rev 2555)
+++ trunk/drbd/drbd_main.c 2006-10-23 14:05:07 UTC (rev 2556)
@@ -3081,8 +3081,8 @@
break;
case Data:
- INFOP("%s (sector %llx, id %s, seq %x, f %x)\n", cmdname(cmd),
- (long long)be64_to_cpu(p->Data.sector),
+ INFOP("%s (sector %llus, id %s, seq %u, f %x)\n", cmdname(cmd),
+ (unsigned long long)be64_to_cpu(p->Data.sector),
_dump_block_id(p->Data.block_id,tmp),
be32_to_cpu(p->Data.seq_num),
be32_to_cpu(p->Data.dp_flags)
@@ -3091,8 +3091,8 @@
case DataReply:
case RSDataReply:
- INFOP("%s (sector %llx, id %s)\n", cmdname(cmd),
- (long long)be64_to_cpu(p->Data.sector),
+ INFOP("%s (sector %llus, id %s)\n", cmdname(cmd),
+ (unsigned long long)be64_to_cpu(p->Data.sector),
_dump_block_id(p->Data.block_id,tmp)
);
break;
@@ -3102,7 +3102,7 @@
case DiscardAck:
case NegAck:
case NegRSDReply:
- INFOP("%s (sector %llx, size %x, id %s, seq %x)\n", cmdname(cmd),
+ INFOP("%s (sector %llus, size %u, id %s, seq %u)\n", cmdname(cmd),
(long long)be64_to_cpu(p->BlockAck.sector),
be32_to_cpu(p->BlockAck.blksize),
_dump_block_id(p->BlockAck.block_id,tmp),
@@ -3112,7 +3112,7 @@
case DataRequest:
case RSDataRequest:
- INFOP("%s (sector %llx, size %x, id %s)\n", cmdname(cmd),
+ INFOP("%s (sector %llus, size %u, id %s)\n", cmdname(cmd),
(long long)be64_to_cpu(p->BlockRequest.sector),
be32_to_cpu(p->BlockRequest.blksize),
_dump_block_id(p->BlockRequest.block_id,tmp)
Modified: trunk/drbd/drbd_receiver.c
===================================================================
--- trunk/drbd/drbd_receiver.c 2006-10-23 08:58:47 UTC (rev 2555)
+++ trunk/drbd/drbd_receiver.c 2006-10-23 14:05:07 UTC (rev 2556)
@@ -282,8 +282,8 @@
e->flags = 0;
MTRACE(TraceTypeEE,TraceLvlAll,
- INFO("allocated EE sec=%lld size=%d ee=%p\n",
- (long long)sector,data_size,e);
+ INFO("allocated EE sec=%llus size=%u ee=%p\n",
+ (unsigned long long)sector,data_size,e);
);
return e;
@@ -306,8 +306,8 @@
int i;
MTRACE(TraceTypeEE,TraceLvlAll,
- INFO("Free EE sec=%lld size=%d ee=%p\n",
- (long long)e->sector,e->size,e);
+ INFO("Free EE sec=%llus size=%u ee=%p\n",
+ (unsigned long long)e->sector,e->size,e);
);
__bio_for_each_segment(bvec, bio, i, 0) {
@@ -387,8 +387,8 @@
*/
list_for_each_entry_safe(e, t, &work_list, w.list) {
MTRACE(TraceTypeEE,TraceLvlAll,
- INFO("Process EE on done_ee sec=%lld size=%d ee=%p\n",
- (long long)e->sector,e->size,e);
+ INFO("Process EE on done_ee sec=%llus size=%u ee=%p\n",
+ (unsigned long long)e->sector,e->size,e);
);
// list_del not necessary, next/prev members not touched
if (e->w.cb(mdev,&e->w,0) == 0) ok = 0;
@@ -1062,8 +1062,8 @@
spin_unlock_irq(&mdev->req_lock);
MTRACE(TraceTypeEE,TraceLvlAll,
- INFO("submit EE (RS)WRITE sec=%lld size=%d ee=%p\n",
- (long long)e->sector,e->size,e);
+ INFO("submit EE (RS)WRITE sec=%llus size=%u ee=%p\n",
+ (unsigned long long)e->sector,e->size,e);
);
drbd_generic_make_request(WRITE,DRBD_FAULT_RS_WR,e->private_bio);
/* accounting done in endio */
@@ -1398,7 +1398,7 @@
/* only ALERT on first iteration,
* we may be woken up early... */
ALERT("%s[%u] Concurrent local write detected!"
- " new: %llu +%d; pending: %llu +%d\n",
+ " new: %llus +%u; pending: %llus +%u\n",
current->comm, current->pid,
(unsigned long long)sector, size,
(unsigned long long)i->sector, i->size);
@@ -1412,7 +1412,7 @@
/* Discard Ack only for the _first_ iteration */
if (first && discard && have_unacked) {
- ALERT("Concurrent write! [DISCARD BY FLAG] sec=%llu\n",
+ ALERT("Concurrent write! [DISCARD BY FLAG] sec=%llus\n",
(unsigned long long)sector);
inc_unacked(mdev);
mdev->epoch_size++;
@@ -1443,7 +1443,7 @@
if (first) {
first = 0;
ALERT("Concurrent write! [W AFTERWARDS] "
- "sec=%llu\n",(unsigned long long)sector);
+ "sec=%llus\n",(unsigned long long)sector);
} else if (discard) {
/* we had none on the first iteration.
* there must be none now. */
@@ -1546,8 +1546,8 @@
}
MTRACE(TraceTypeEE,TraceLvlAll,
- INFO("submit EE (DATA)WRITE sec=%lld size=%d ee=%p\n",
- (long long)e->sector,e->size,e);
+ INFO("submit EE (DATA)WRITE sec=%llus size=%u ee=%p\n",
+ (unsigned long long)e->sector,e->size,e);
);
/* FIXME drbd_al_begin_io in case we have two primaries... */
drbd_generic_make_request(WRITE,DRBD_FAULT_DT_WR,e->private_bio);
@@ -1583,13 +1583,13 @@
size = be32_to_cpu(p->blksize);
if (size <= 0 || (size & 0x1ff) != 0 || size > DRBD_MAX_SEGMENT_SIZE) {
- ERR("%s:%d: sector: %lu, size: %d\n", __FILE__, __LINE__,
- (unsigned long)sector,size);
+ ERR("%s:%d: sector: %llus, size: %u\n", __FILE__, __LINE__,
+ (unsigned long long)sector,size);
return FALSE;
}
if ( sector + (size>>9) > capacity) {
- ERR("%s:%d: sector: %lu, size: %d\n", __FILE__, __LINE__,
- (unsigned long)sector,size);
+ ERR("%s:%d: sector: %llus, size: %u\n", __FILE__, __LINE__,
+ (unsigned long long)sector,size);
return FALSE;
}
@@ -1642,8 +1642,8 @@
inc_unacked(mdev);
MTRACE(TraceTypeEE,TraceLvlAll,
- INFO("submit EE READ sec=%lld size=%d ee=%p\n",
- (long long)e->sector,e->size,e);
+ INFO("submit EE READ sec=%llus size=%u ee=%p\n",
+ (unsigned long long)e->sector,e->size,e);
);
/* FIXME actually, it could be a READA originating from the peer ... */
drbd_generic_make_request(READ,fault_type,e->private_bio);
@@ -1964,6 +1964,8 @@
rv = Connected;
drbd_bm_lock(mdev); // {
if(drbd_bm_total_weight(mdev)) {
+ /* FIXME for two-primaries this is wrong and may lead
+ * to diverging data sets! */
INFO("No resync -> clearing bit map.\n");
drbd_bm_clear_all(mdev);
drbd_uuid_set_bm(mdev,0UL);
@@ -2060,7 +2062,7 @@
if (a == 0 || b == 0) return;
d = (a > b) ? (a - b) : (b - a);
if ( d > (a>>3) || d > (b>>3)) {
- WARN("Considerable difference in %s: %llu vs. %llu\n", s,
+ WARN("Considerable difference in %s: %llus vs. %llus\n", s,
(unsigned long long)a, (unsigned long long)b);
}
}
@@ -3055,7 +3057,7 @@
break;
case DiscardAck:
D_ASSERT(mdev->net_conf->wire_protocol == DRBD_PROT_C);
- ALERT("Got DiscardAck packet %llu +%u!"
+ ALERT("Got DiscardAck packet %llus +%u!"
" DRBD is not a random data generator!\n",
(unsigned long long)req->sector, req->size);
_req_mod(req, conflict_discarded_by_peer);
@@ -3114,7 +3116,9 @@
return FALSE;
}
- ERR("Got NegDReply; Sector %llx, len %x; Fail original request.\n",
+ /* FIXME explicitly warn if protocol != C */
+
+ ERR("Got NegDReply; Sector %llus, len %u; Fail original request.\n",
(unsigned long long)sector,be32_to_cpu(p->blksize));
_req_mod(req, neg_acked);
Modified: trunk/drbd/drbd_req.c
===================================================================
--- trunk/drbd/drbd_req.c 2006-10-23 08:58:47 UTC (rev 2555)
+++ trunk/drbd/drbd_req.c 2006-10-23 14:05:07 UTC (rev 2556)
@@ -74,7 +74,7 @@
bio_data_dir(req->master_bio) == WRITE) ?
'W' : 'R';
- INFO("%s %p %c L%c%c%cN%c%c%c%c%c %u (%4u:%llu) %s\n",
+ INFO("%s %p %c L%c%c%cN%c%c%c%c%c %u (%llus +%u) %s\n",
txt, req, rw,
s & RQ_LOCAL_PENDING ? 'p' : '-',
s & RQ_LOCAL_COMPLETED ? 'c' : '-',
@@ -84,7 +84,7 @@
s & RQ_NET_SENT ? 's' : '-',
s & RQ_NET_DONE ? 'd' : '-',
s & RQ_NET_OK ? 'o' : '-',
- req->epoch, req->size, req->sector,
+ req->epoch, req->sector, req->size,
conns_to_name(mdev->state.conn));
}
@@ -165,7 +165,7 @@
slot = tl_hash_slot(mdev,sector);
hlist_for_each_entry(i, n, slot, colision) {
if (OVERLAPS) {
- ALERT("LOGIC BUG: completed: %p %llu +%d; other: %p %llu +%d\n",
+ ALERT("LOGIC BUG: completed: %p %llus +%u; other: %p %llus +%u\n",
req, (unsigned long long)sector, size,
i, (unsigned long long)i->sector, i->size);
}
@@ -334,7 +334,7 @@
hlist_for_each_entry(i, n, slot, colision) {
if (OVERLAPS) {
ALERT("%s[%u] Concurrent local write detected!"
- " [DISCARD L] new: %llu +%d; pending: %llu +%d\n",
+ " [DISCARD L] new: %llus +%u; pending: %llus +%u\n",
current->comm, current->pid,
(unsigned long long)sector, size,
(unsigned long long)i->sector, i->size);
@@ -351,7 +351,7 @@
hlist_for_each_entry(e, n, slot, colision) {
if (OVERLAPS) {
ALERT("%s[%u] Concurrent remote write detected!"
- " [DISCARD L] new: %llu +%d; pending: %llu +%d\n",
+ " [DISCARD L] new: %llus +%u; pending: %llus +%u\n",
current->comm, current->pid,
(unsigned long long)sector, size,
(unsigned long long)e->sector, e->size);
@@ -445,7 +445,7 @@
bio_put(req->private_bio);
req->private_bio = NULL;
dec_local(mdev);
- ALERT("Local WRITE failed sec=%llu size=%u\n",
+ ALERT("Local WRITE failed sec=%llus size=%u\n",
(unsigned long long)req->sector, req->size);
/* and now: check how to handle local io error.
* FIXME see comment below in read_completed_with_error */
@@ -465,7 +465,7 @@
/* it is legal to fail READA */
break;
/* else */
- ALERT("Local READ failed sec=%llu size=%u\n",
+ ALERT("Local READ failed sec=%llus size=%u\n",
(unsigned long long)req->sector, req->size);
/* _req_mod(req,to_be_send); oops, recursion in static inline */
D_ASSERT(!(req->rq_state & RQ_NET_MASK));
@@ -643,10 +643,8 @@
* this is bad, because if the connection is lost now,
* we won't be able to clean them up... */
const unsigned long s = req->rq_state;
- INFO("%s %p %c L%c%c%cN%c%c%c%c%c %u\n",
- "FIXME",
- req,
- bio_data_dir(req->master_bio) == WRITE ? 'W' : 'R',
+ INFO("%s %p %c L%c%c%cN%c%c%c%c%c %u (%llus +%u) %s\n",
+ "FIXME", req, rw ? 'W' : 'R',
s & RQ_LOCAL_PENDING ? 'p' : '-',
s & RQ_LOCAL_COMPLETED ? 'c' : '-',
s & RQ_LOCAL_OK ? 'o' : '-',
@@ -655,7 +653,8 @@
s & RQ_NET_SENT ? 's' : '-',
s & RQ_NET_DONE ? 'd' : '-',
s & RQ_NET_OK ? 'o' : '-',
- req->epoch);
+ req->epoch, req->sector, req->size,
+ conns_to_name(mdev->state.conn));
}
D_ASSERT(req->rq_state & RQ_NET_SENT);
req->rq_state |= RQ_NET_DONE;
Modified: trunk/drbd/drbd_req.h
===================================================================
--- trunk/drbd/drbd_req.h 2006-10-23 08:58:47 UTC (rev 2555)
+++ trunk/drbd/drbd_req.h 2006-10-23 14:05:07 UTC (rev 2556)
@@ -218,7 +218,7 @@
if ((unsigned long)req == (unsigned long)id) {
if (req->sector != sector) {
ERR("_ack_id_to_req: found req %p but it has "
- "wrong sector (%llx versus %llx)\n", req,
+ "wrong sector (%llus versus %llus)\n", req,
(unsigned long long)req->sector,
(unsigned long long)sector);
break;
@@ -226,7 +226,7 @@
return req;
}
}
- ERR("_ack_id_to_req: failed to find req %p, sector %llx in list\n",
+ ERR("_ack_id_to_req: failed to find req %p, sector %llus in list\n",
(void*)(unsigned long)id, (unsigned long long)sector);
return NULL;
}
Modified: trunk/drbd/drbd_worker.c
===================================================================
--- trunk/drbd/drbd_worker.c 2006-10-23 08:58:47 UTC (rev 2555)
+++ trunk/drbd/drbd_worker.c 2006-10-23 14:05:07 UTC (rev 2556)
@@ -92,8 +92,8 @@
dec_local(mdev);
MTRACE(TraceTypeEE,TraceLvlAll,
- INFO("Moved EE (READ) to worker sec=%lld size=%d ee=%p\n",
- (long long)e->sector,e->size,e);
+ INFO("Moved EE (READ) to worker sec=%llus size=%u ee=%p\n",
+ (unsigned long long)e->sector,e->size,e);
);
return 0;
}
@@ -147,8 +147,8 @@
dec_local(mdev);
MTRACE(TraceTypeEE,TraceLvlAll,
- INFO("Moved EE (WRITE) to done_ee sec=%lld size=%d ee=%p\n",
- (long long)e->sector,e->size,e);
+ INFO("Moved EE (WRITE) to done_ee sec=%llus size=%u ee=%p\n",
+ (unsigned long long)e->sector,e->size,e);
);
return 0;
}
@@ -440,7 +440,7 @@
mdev->rs_paused = 0;
// Remove all elements from the resync LRU. Since future actions
- // might set bits in the (main) bitmap, then the entries in the
+ // might set bits in the (main) bitmap, then the entries in the
// resync LRU would be wrong.
drbd_rs_del_all(mdev);
@@ -476,7 +476,7 @@
ok=drbd_send_block(mdev, DataReply, e);
} else {
if (DRBD_ratelimit(5*HZ,5))
- ERR("Sending NegDReply. sector=%llx.\n",
+ ERR("Sending NegDReply. sector=%llus.\n",
(unsigned long long)e->sector);
ok=drbd_send_ack(mdev,NegDReply,e);
@@ -529,7 +529,7 @@
}
} else {
if (DRBD_ratelimit(5*HZ,5))
- ERR("Sending NegRSDReply. sector %llx.\n",
+ ERR("Sending NegRSDReply. sector %llus.\n",
(unsigned long long)e->sector);
ok=drbd_send_ack(mdev,NegRSDReply,e);
@@ -825,7 +825,7 @@
if ( r == SS_Success ) {
after_state_ch(mdev,os,ns,ChgStateVerbose);
-
+
INFO("Began resync as %s (will sync %lu KB [%lu bits set]).\n",
conns_to_name(ns.conn),
(unsigned long) mdev->rs_total << (BM_BLOCK_SIZE_B-10),
More information about the drbd-cvs
mailing list