[DRBD-cvs] svn commit by lars - r2992 -
branches/drbd-8.0-for-linus/drbd -
a6249fb8b2d743b694abd6ca02e44701acb7edfd fix 'need spac
drbd-cvs at lists.linbit.com
drbd-cvs at lists.linbit.com
Tue Jul 24 15:20:56 CEST 2007
Author: lars
Date: 2007-07-24 15:20:54 +0200 (Tue, 24 Jul 2007)
New Revision: 2992
Modified:
branches/drbd-8.0-for-linus/drbd/drbd_actlog.c
branches/drbd-8.0-for-linus/drbd/drbd_bitmap.c
branches/drbd-8.0-for-linus/drbd/drbd_int.h
branches/drbd-8.0-for-linus/drbd/drbd_main.c
branches/drbd-8.0-for-linus/drbd/drbd_nl.c
branches/drbd-8.0-for-linus/drbd/drbd_receiver.c
branches/drbd-8.0-for-linus/drbd/drbd_req.c
branches/drbd-8.0-for-linus/drbd/drbd_worker.c
branches/drbd-8.0-for-linus/drbd/lru_cache.c
Log:
a6249fb8b2d743b694abd6ca02e44701acb7edfd fix 'need spaces around that ...'
Modified: branches/drbd-8.0-for-linus/drbd/drbd_actlog.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_actlog.c 2007-07-24 13:18:46 UTC (rev 2991)
+++ branches/drbd-8.0-for-linus/drbd/drbd_actlog.c 2007-07-24 13:20:54 UTC (rev 2992)
@@ -191,7 +191,7 @@
spin_lock_irq(&mdev->al_lock);
bm_ext = (struct bm_extent *) lc_find(mdev->resync, enr/AL_EXT_PER_BM_SECT);
- if (unlikely(bm_ext!=NULL)) {
+ if (unlikely(bm_ext != NULL)) {
if (test_bit(BME_NO_WRITES, &bm_ext->flags)) {
spin_unlock_irq(&mdev->al_lock);
return 0;
@@ -222,7 +222,7 @@
struct lc_element *al_ext;
struct update_al_work al_work;
- D_ASSERT(atomic_read(&mdev->local_cnt)>0);
+ D_ASSERT(atomic_read(&mdev->local_cnt) > 0);
MTRACE(TraceTypeALExts, TraceLvlMetrics,
INFO("al_begin_io( sec=%llus (al_enr=%u) (rs_enr=%d) )\n",
@@ -325,14 +325,14 @@
mx = min_t(int, AL_EXTENTS_PT,
mdev->act_log->nr_elements - mdev->al_tr_cycle);
- for(i = 0;i<mx;i++) {
+ for(i = 0;i < mx;i++) {
extent_nr = lc_entry(mdev->act_log,
mdev->al_tr_cycle+i)->lc_number;
buffer->updates[i+1].pos = cpu_to_be32(mdev->al_tr_cycle+i);
buffer->updates[i+1].extent = cpu_to_be32(extent_nr);
xor_sum ^= extent_nr;
}
- for(;i<AL_EXTENTS_PT;i++) {
+ for(;i < AL_EXTENTS_PT;i++) {
buffer->updates[i+1].pos = __constant_cpu_to_be32(-1);
buffer->updates[i+1].extent = __constant_cpu_to_be32(LC_FREE);
xor_sum ^= LC_FREE;
@@ -386,7 +386,7 @@
rv = ( be32_to_cpu(b->magic) == DRBD_MAGIC );
- for(i = 0;i<AL_EXTENTS_PT+1;i++)
+ for(i = 0;i < AL_EXTENTS_PT+1;i++)
xor_sum ^= be32_to_cpu(b->updates[i].extent);
rv &= (xor_sum == be32_to_cpu(b->xor_sum));
@@ -416,7 +416,7 @@
buffer = page_address(mdev->md_io_page);
/* Find the valid transaction in the log */
- for(i = 0;i<=mx;i++) {
+ for(i = 0;i <= mx;i++) {
rv = drbd_al_read_tr(mdev, bdev, buffer, i);
if (rv == 0) continue;
if (rv == -1) {
@@ -468,7 +468,7 @@
elements there might be an old version of the
updated element (in slot 0). So the element in slot 0
can overwrite old versions. */
- for(j = AL_EXTENTS_PT;j>=0;j--) {
+ for(j = AL_EXTENTS_PT;j >= 0;j--) {
pos = be32_to_cpu(buffer->updates[j].pos);
extent_nr = be32_to_cpu(buffer->updates[j].extent);
@@ -562,7 +562,7 @@
}
bio = bio_alloc(GFP_KERNEL, 1);
- if (bio==NULL) return -ENOMEM;
+ if (bio == NULL) return -ENOMEM;
bio->bi_bdev = mdev->bc->md_bdev;
bio->bi_sector = on_disk_sector;
@@ -585,7 +585,7 @@
kunmap(*page);
/* no memory leak, page gets cleaned up by caller */
- if (bio_add_page(bio, *page, MD_HARDSECT, *page_offset)!=MD_HARDSECT)
+ if (bio_add_page(bio, *page, MD_HARDSECT, *page_offset) != MD_HARDSECT)
return -EINVAL;
if (!allocated_page) get_page(*page);
@@ -635,7 +635,7 @@
wc.mdev = mdev;
wc.error = 0;
- for(i = 0;i<nr_elements;i++) {
+ for(i = 0;i < nr_elements;i++) {
enr = lc_entry(mdev->act_log, i)->lc_number;
if (enr == LC_FREE) continue;
/* next statement also does atomic_inc wc.count */
@@ -651,8 +651,8 @@
wake_up(&mdev->al_wait);
/* all prepared, submit them */
- for(i = 0;i<nr_elements;i++) {
- if (bios[i]==NULL) break;
+ for(i = 0;i < nr_elements;i++) {
+ if (bios[i] == NULL) break;
if (FAULT_ACTIVE( mdev, DRBD_FAULT_MD_WR )) {
bios[i]->bi_rw = WRITE;
bio_endio(bios[i], bios[i]->bi_size, -EIO);
@@ -680,8 +680,8 @@
free_bios_submit_one_by_one:
/* free everything by calling the endio callback directly. */
- for(i = 0;i<nr_elements;i++) {
- if (bios[i]==NULL) break;
+ for(i = 0;i < nr_elements;i++) {
+ if (bios[i] == NULL) break;
bios[i]->bi_size = 0;
atodb_endio(bios[i], MD_HARDSECT, 0);
}
@@ -690,7 +690,7 @@
submit_one_by_one:
WARN("Using the slow drbd_al_to_on_disk_bm()\n");
- for(i = 0;i<mdev->act_log->nr_elements;i++) {
+ for(i = 0;i < mdev->act_log->nr_elements;i++) {
enr = lc_entry(mdev->act_log, i)->lc_number;
if (enr == LC_FREE) continue;
/* Really slow: if we have al-extents 16..19 active,
@@ -716,7 +716,7 @@
wait_event(mdev->al_wait, lc_try_lock(mdev->act_log));
- for(i = 0;i<mdev->act_log->nr_elements;i++) {
+ for(i = 0;i < mdev->act_log->nr_elements;i++) {
enr = lc_entry(mdev->act_log, i)->lc_number;
if (enr == LC_FREE) continue;
add += drbd_bm_ALe_set_all(mdev, enr);
@@ -755,7 +755,7 @@
D_ASSERT( test_bit(__LC_DIRTY, &mdev->act_log->flags) );
- for(i = 0;i<mdev->act_log->nr_elements;i++) {
+ for(i = 0;i < mdev->act_log->nr_elements;i++) {
al_ext = lc_entry(mdev->act_log, i);
if (al_ext->lc_number == LC_FREE) continue;
wait_event(mdev->al_wait, _try_lc_del(mdev, al_ext));
@@ -1101,7 +1101,7 @@
if (test_bit(BME_LOCKED, &bm_ext->flags)) return 1;
- for(i = 0;i<AL_EXT_PER_BM_SECT;i++) {
+ for(i = 0;i < AL_EXT_PER_BM_SECT;i++) {
sig = wait_event_interruptible( mdev->al_wait,
!_is_in_al(mdev, enr*AL_EXT_PER_BM_SECT+i) );
if (sig) {
@@ -1220,7 +1220,7 @@
MTRACE(TraceTypeResync, TraceLvlAll,
INFO("checking al for %u\n", enr);
);
- for (i = 0;i<AL_EXT_PER_BM_SECT;i++) {
+ for (i = 0;i < AL_EXT_PER_BM_SECT;i++) {
if (unlikely(al_enr+i == mdev->act_log->new_number))
goto try_again;
if (lc_is_used(mdev->act_log, al_enr+i))
@@ -1294,7 +1294,7 @@
if (inc_local_if_state(mdev, Failed)) {
/* ok, ->resync is there. */
- for(i = 0;i<mdev->resync->nr_elements;i++) {
+ for(i = 0;i < mdev->resync->nr_elements;i++) {
bm_ext = (struct bm_extent *) lc_entry(mdev->resync, i);
if (bm_ext->lce.lc_number == LC_FREE) continue;
bm_ext->lce.refcnt = 0; /* Rude but ok. */
@@ -1331,7 +1331,7 @@
if (inc_local_if_state(mdev, Failed)) {
/* ok, ->resync is there. */
- for(i = 0;i<mdev->resync->nr_elements;i++) {
+ for(i = 0;i < mdev->resync->nr_elements;i++) {
bm_ext = (struct bm_extent *) lc_entry(mdev->resync, i);
if (bm_ext->lce.lc_number == LC_FREE) continue;
if (bm_ext->lce.lc_number == mdev->resync_wenr) {
@@ -1356,7 +1356,7 @@
D_ASSERT(!test_bit(BME_NO_WRITES, &bm_ext->flags));
lc_del(mdev->resync, &bm_ext->lce);
}
- D_ASSERT(mdev->resync->used==0);
+ D_ASSERT(mdev->resync->used == 0);
dec_local(mdev);
}
spin_unlock_irq(&mdev->al_lock);
@@ -1414,7 +1414,7 @@
*/
spin_lock_irq(&mdev->al_lock);
for(bnr = sbnr; bnr <= ebnr; bnr++) {
- if (drbd_bm_test_bit(mdev, bnr)>0) count++;
+ if (drbd_bm_test_bit(mdev, bnr) > 0) count++;
}
if (count) {
mdev->rs_failed += count;
Modified: branches/drbd-8.0-for-linus/drbd/drbd_bitmap.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_bitmap.c 2007-07-24 13:18:46 UTC (rev 2991)
+++ branches/drbd-8.0-for-linus/drbd/drbd_bitmap.c 2007-07-24 13:20:54 UTC (rev 2992)
@@ -932,7 +932,7 @@
ERR_IF(!b->bm) return 1;
spin_lock(&b->bm_lock);
- for (bitnr = s; bitnr <=e; bitnr++) {
+ for (bitnr = s; bitnr <= e; bitnr++) {
ERR_IF (bitnr >= b->bm_bits) {
ERR("bitnr=%lu bm_bits=%lu\n", bitnr, b->bm_bits);
} else {
Modified: branches/drbd-8.0-for-linus/drbd/drbd_int.h
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_int.h 2007-07-24 13:18:46 UTC (rev 2991)
+++ branches/drbd-8.0-for-linus/drbd/drbd_int.h 2007-07-24 13:20:54 UTC (rev 2992)
@@ -189,7 +189,7 @@
ERR("ASSERT( " #exp " ) in %s:%d\n", __FILE__, __LINE__)
#endif
#define ERR_IF(exp) if (({ \
- int _b = (exp)!=0; \
+ int _b = (exp) != 0; \
if (_b) ERR("%s: (" #exp ") in %s:%d\n", __func__, __FILE__, __LINE__); \
_b; \
}))
@@ -1679,7 +1679,7 @@
}
#define ERR_IF_CNT_IS_NEGATIVE(which) \
- if (atomic_read(&mdev->which)<0) \
+ if (atomic_read(&mdev->which) < 0) \
ERR("in %s:%d: " #which " = %d < 0 !\n", \
__func__ , __LINE__ , \
atomic_read(&mdev->which))
@@ -1761,7 +1761,7 @@
{
if (atomic_dec_and_test(&mdev->local_cnt))
wake_up(&mdev->misc_wait);
- D_ASSERT(atomic_read(&mdev->local_cnt)>=0);
+ D_ASSERT(atomic_read(&mdev->local_cnt) >= 0);
}
/**
* inc_local: Returns TRUE when local IO is possible. If it returns
@@ -1840,7 +1840,7 @@
int mxb = drbd_get_max_buffers(mdev);
int ap_bio = atomic_dec_return(&mdev->ap_bio_cnt);
- D_ASSERT(ap_bio>=0);
+ D_ASSERT(ap_bio >= 0);
if (ap_bio < mxb) wake_up(&mdev->misc_wait);
}
Modified: branches/drbd-8.0-for-linus/drbd/drbd_main.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_main.c 2007-07-24 13:18:46 UTC (rev 2991)
+++ branches/drbd-8.0-for-linus/drbd/drbd_main.c 2007-07-24 13:20:54 UTC (rev 2992)
@@ -381,7 +381,7 @@
rv = _drbd_set_state(mdev, ns, f);
ns = mdev->state;
spin_unlock_irqrestore(&mdev->req_lock, flags);
- if (rv==SS_Success && !(f&ScheduleAfter)) after_state_ch(mdev, os, ns, f);
+ if (rv == SS_Success && !(f&ScheduleAfter)) after_state_ch(mdev, os, ns, f);
return rv;
}
@@ -414,9 +414,9 @@
if ( !cl_wide_st_chg(mdev, os, ns) ) rv = SS_CW_NoNeed;
if (!rv) {
rv = is_valid_state(mdev, ns);
- if (rv==SS_Success) {
+ if (rv == SS_Success) {
rv = is_valid_state_transition(mdev, ns, os);
- if (rv==SS_Success) rv = 0; /* cont waiting, otherwise fail. */
+ if (rv == SS_Success) rv = 0; /* cont waiting, otherwise fail. */
}
}
spin_unlock_irqrestore(&mdev->req_lock, flags);
@@ -477,7 +477,7 @@
ns = mdev->state;
spin_unlock_irqrestore(&mdev->req_lock, flags);
- if (rv==SS_Success && !(f&ScheduleAfter)) after_state_ch(mdev, os, ns, f);
+ if (rv == SS_Success && !(f&ScheduleAfter)) after_state_ch(mdev, os, ns, f);
return rv;
}
@@ -885,8 +885,8 @@
}
/* Lost contact to peer's copy of the data */
- if ( (os.pdsk>=Inconsistent && os.pdsk!=DUnknown && os.pdsk!=Outdated) &&
- (ns.pdsk<Inconsistent || ns.pdsk==DUnknown || ns.pdsk==Outdated) ) {
+ if ( (os.pdsk >= Inconsistent && os.pdsk != DUnknown && os.pdsk != Outdated) &&
+ (ns.pdsk < Inconsistent || ns.pdsk == DUnknown || ns.pdsk == Outdated) ) {
if (mdev->p_uuid) {
kfree(mdev->p_uuid);
mdev->p_uuid = NULL;
@@ -2139,7 +2139,7 @@
/* drbd's page pool */
spin_lock_init(&drbd_pp_lock);
- for (i = 0;i< number;i++) {
+ for (i = 0;i < number;i++) {
page = alloc_page(GFP_HIGHUSER);
if (!page) goto Enomem;
set_page_private(page, (unsigned long)drbd_pp_pool);
@@ -2343,7 +2343,7 @@
return -EINVAL;
}
- if (1 > minor_count||minor_count > 255) {
+ if (1 > minor_count || minor_count > 255) {
printk(KERN_ERR DEVICE_NAME
": invalid minor_count (%d)\n", minor_count);
#ifdef MODULE
@@ -2632,7 +2632,7 @@
{
int i;
- for ( i = History_start ; i<History_end ; i++ ) {
+ for ( i = History_start ; i < History_end ; i++ ) {
mdev->bc->md.uuid[i+1] = mdev->bc->md.uuid[i];
MTRACE(TraceTypeUuid, TraceLvlAll,
@@ -2696,9 +2696,9 @@
void drbd_uuid_set_bm(drbd_dev *mdev, u64 val)
{
- if (mdev->bc->md.uuid[Bitmap]==0 && val==0) return;
+ if (mdev->bc->md.uuid[Bitmap] == 0 && val == 0) return;
- if (val==0) {
+ if (val == 0) {
drbd_uuid_move_history(mdev);
mdev->bc->md.uuid[History_start] = mdev->bc->md.uuid[Bitmap];
mdev->bc->md.uuid[Bitmap] = 0;
@@ -2971,7 +2971,7 @@
pstart_va += (p-pstart);
pstart = p;
count = 0;
- offset+= LINE_SIZE;
+ offset += LINE_SIZE;
/* Re-init strings */
pbytes = bytes_str;
@@ -3159,7 +3159,7 @@
INFO("%s %s Bio:%p - %soffset " SECTOR_FORMAT ", size %x\n",
complete? "<<<":">>>",
- bio_rw(bio)==WRITE?"Write":"Read", bio,
+ bio_rw(bio) == WRITE?"Write":"Read", bio,
complete? (drbd_bio_uptodate(bio)? "Success, ":"Failed, ") : "",
bio->bi_sector << SECTOR_SHIFT,
bio->bi_size);
Modified: branches/drbd-8.0-for-linus/drbd/drbd_nl.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_nl.c 2007-07-24 13:18:46 UTC (rev 2991)
+++ branches/drbd-8.0-for-linus/drbd/drbd_nl.c 2007-07-24 13:20:54 UTC (rev 2992)
@@ -156,7 +156,7 @@
printk(KERN_INFO DEVICE_NAME "%d: "
"Netlink: >> %s (%d) - seq: %x, ack: %x, len: %x\n",
nlp->minor,
- nlp->packet_type==P_nl_after_last_packet?
+ nlp->packet_type == P_nl_after_last_packet?
"Empty-Reply" : nl_packet_name(nlp->packet_type),
nlp->packet_type,
req->seq, req->ack, req->len);
@@ -582,7 +582,7 @@
n = lc_alloc("act_log", mdev->sync_conf.al_extents,
sizeof(struct lc_element), mdev);
- if (n==NULL) {
+ if (n == NULL) {
ERR("Cannot allocate act_log lru!\n");
return -ENOMEM;
}
@@ -779,16 +779,16 @@
nbc->md_bdev = inode2->i_bdev;
if (bd_claim(nbc->md_bdev,
- (nbc->dc.meta_dev_idx==DRBD_MD_INDEX_INTERNAL ||
- nbc->dc.meta_dev_idx==DRBD_MD_INDEX_FLEX_INT) ?
+ (nbc->dc.meta_dev_idx == DRBD_MD_INDEX_INTERNAL ||
+ nbc->dc.meta_dev_idx == DRBD_MD_INDEX_FLEX_INT) ?
(void *)mdev : (void *) drbd_m_holder )) {
retcode = MDMounted;
goto release_bdev_fail;
}
- if ( (nbc->backing_bdev==nbc->md_bdev) !=
- (nbc->dc.meta_dev_idx==DRBD_MD_INDEX_INTERNAL ||
- nbc->dc.meta_dev_idx==DRBD_MD_INDEX_FLEX_INT) ) {
+ if ( (nbc->backing_bdev == nbc->md_bdev) !=
+ (nbc->dc.meta_dev_idx == DRBD_MD_INDEX_INTERNAL ||
+ nbc->dc.meta_dev_idx == DRBD_MD_INDEX_FLEX_INT) ) {
retcode = LDMDInvalid;
goto release_bdev2_fail;
}
@@ -947,7 +947,7 @@
rv = _drbd_set_state(mdev, ns, ChgStateVerbose);
ns = mdev->state;
spin_unlock_irq(&mdev->req_lock);
- if (rv==SS_Success) after_state_ch(mdev, os, ns, ChgStateVerbose);
+ if (rv == SS_Success) after_state_ch(mdev, os, ns, ChgStateVerbose);
if (rv < SS_Success)
goto unlock_bm;
@@ -1063,7 +1063,7 @@
#define O_ADDR(A) (((struct sockaddr_in *)&A->peer_addr)->sin_addr.s_addr)
#define O_PORT(A) (((struct sockaddr_in *)&A->peer_addr)->sin_port)
retcode = NoError;
- for(i = 0;i<minor_count;i++) {
+ for(i = 0;i < minor_count;i++) {
odev = minor_to_mdev(i);
if (!odev || odev == mdev) continue;
if ( inc_net(odev)) {
@@ -1144,7 +1144,7 @@
new_conf->ping_int = new_conf->ping_int+1;
#endif
- D_ASSERT(mdev->net_conf==NULL);
+ D_ASSERT(mdev->net_conf == NULL);
mdev->net_conf = new_conf;
mdev->send_cnt = 0;
@@ -1209,7 +1209,7 @@
if (retcode < SS_Success) goto fail;
if ( wait_event_interruptible( mdev->misc_wait,
- mdev->state.conn==StandAlone) ) {
+ mdev->state.conn == StandAlone) ) {
retcode = GotSignal;
goto fail;
}
@@ -1407,7 +1407,7 @@
ns = mdev->state;
spin_unlock_irq(&mdev->req_lock);
- if (retcode==SS_Success) after_state_ch(mdev, os, ns, ChgStateVerbose);
+ if (retcode == SS_Success) after_state_ch(mdev, os, ns, ChgStateVerbose);
if (retcode == -999) {
retcode = DiskLowerThanOutdated;
Modified: branches/drbd-8.0-for-linus/drbd/drbd_receiver.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_receiver.c 2007-07-24 13:18:46 UTC (rev 2991)
+++ branches/drbd-8.0-for-linus/drbd/drbd_receiver.c 2007-07-24 13:20:54 UTC (rev 2992)
@@ -931,7 +931,7 @@
ds -= rr;
}
- mdev->recv_cnt+=data_size>>9;
+ mdev->recv_cnt += data_size>>9;
return e;
}
@@ -1021,8 +1021,8 @@
/* Record failure to sync */
drbd_rs_failed_io(mdev, sector, e->size);
- ok = drbd_send_ack(mdev, NegAck, e);
- ok&= drbd_io_error(mdev, FALSE);
+ ok = drbd_send_ack(mdev, NegAck, e);
+ ok &= drbd_io_error(mdev, FALSE);
}
dec_unacked(mdev);
@@ -1170,7 +1170,7 @@
e->flags & EE_MAY_SET_IN_SYNC) ?
RSWriteAck : WriteAck;
ok &= drbd_send_ack(mdev, pcmd, e);
- if (pcmd==RSWriteAck)
+ if (pcmd == RSWriteAck)
drbd_set_in_sync(mdev, sector, e->size);
} else {
/* FIXME I think we should send a NegAck regardless of
@@ -1179,8 +1179,8 @@
* NegAck is sent. basically that means that drbd_process_done_ee
* may not list_del() the ee before this callback did run...
* maybe even move the list_del(e) in here... */
- ok = drbd_send_ack(mdev, NegAck, e);
- ok&= drbd_io_error(mdev, FALSE);
+ ok = drbd_send_ack(mdev, NegAck, e);
+ ok &= drbd_io_error(mdev, FALSE);
/* we expect it to be marked out of sync anyways...
* maybe assert this? */
}
@@ -1734,10 +1734,10 @@
rv = drbd_asb_recover_0p(mdev);
break;
case DiscardSecondary:
- return mdev->state.role==Primary ? 1 : -1;
+ return mdev->state.role == Primary ? 1 : -1;
case CallHelper:
hg = drbd_asb_recover_0p(mdev);
- if (hg == -1 && mdev->state.role==Primary) {
+ if (hg == -1 && mdev->state.role == Primary) {
self = drbd_set_role(mdev, Secondary, 0);
if (self != SS_Success) {
drbd_khelper(mdev, "pri-lost-after-sb");
@@ -1856,7 +1856,7 @@
if (self == peer) return -1;
*rule_nr = 6;
- for ( i = History_start ; i<=History_end ; i++ ) {
+ for ( i = History_start ; i <= History_end ; i++ ) {
peer = mdev->p_uuid[i] & ~((u64)1);
if (self == peer) return -2;
}
@@ -1867,7 +1867,7 @@
if (self == peer) return 1;
*rule_nr = 8;
- for ( i = History_start ; i<=History_end ; i++ ) {
+ for ( i = History_start ; i <= History_end ; i++ ) {
self = mdev->bc->md.uuid[i] & ~((u64)1);
if (self == peer) return 2;
}
@@ -1878,9 +1878,9 @@
if (self == peer && self != ((u64)0) ) return 100;
*rule_nr = 10;
- for ( i = History_start ; i<=History_end ; i++ ) {
+ for ( i = History_start ; i <= History_end ; i++ ) {
self = mdev->p_uuid[i] & ~((u64)1);
- for ( j = History_start ; j<=History_end ; j++ ) {
+ for ( j = History_start ; j <= History_end ; j++ ) {
peer = mdev->p_uuid[j] & ~((u64)1);
if (self == peer) return -100;
}
@@ -1917,8 +1917,8 @@
return conn_mask;
}
- if ( (mydisk==Inconsistent && peer_disk>Inconsistent) ||
- (peer_disk==Inconsistent && mydisk>Inconsistent) ) {
+ if ( (mydisk == Inconsistent && peer_disk > Inconsistent) ||
+ (peer_disk == Inconsistent && mydisk > Inconsistent) ) {
int f = (hg == -100) || abs(hg) == 2;
hg = mydisk > Inconsistent ? 1 : -1;
if (f) hg = hg*2;
@@ -1927,7 +1927,7 @@
}
if (hg == 100 || (hg == -100 && mdev->net_conf->always_asbp) ) {
- int pcount = (mdev->state.role==Primary) + (peer_role==Primary);
+ int pcount = (mdev->state.role == Primary) + (peer_role == Primary);
int forced = (hg == -100);
switch (pcount) {
@@ -2374,7 +2374,7 @@
}
}
- if (rv==SS_Success)
+ if (rv == SS_Success)
after_state_ch(mdev, os, ns, ChgStateVerbose | ChgStateHard);
mdev->net_conf->want_lose = 0;
@@ -2432,7 +2432,7 @@
num_words = min_t(size_t, BM_PACKET_WORDS, bm_words-bm_i );
want = num_words * sizeof(long);
ERR_IF(want != h->length) goto out;
- if (want==0) break;
+ if (want == 0) break;
if (drbd_recv(mdev, buffer, want) != want)
goto out;
@@ -2565,7 +2565,7 @@
* Application READ requests
*/
spin_lock_irq(&mdev->req_lock);
- for(i = 0;i<APP_R_HSIZE;i++) {
+ for(i = 0;i < APP_R_HSIZE;i++) {
slot = mdev->app_reads_hash+i;
hlist_for_each_entry(req, n, slot, colision) {
list_add(&req->w.list, &workset);
Modified: branches/drbd-8.0-for-linus/drbd/drbd_req.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_req.c 2007-07-24 13:18:46 UTC (rev 2991)
+++ branches/drbd-8.0-for-linus/drbd/drbd_req.c 2007-07-24 13:20:54 UTC (rev 2992)
@@ -991,8 +991,8 @@
* was not detached below us? */
req->private_bio->bi_bdev = mdev->bc->backing_bdev;
- if (FAULT_ACTIVE(mdev, rw==WRITE ? DRBD_FAULT_DT_WR :
- ( rw==READ ? DRBD_FAULT_DT_RD :
+ if (FAULT_ACTIVE(mdev, rw == WRITE ? DRBD_FAULT_DT_WR :
+ ( rw == READ ? DRBD_FAULT_DT_RD :
DRBD_FAULT_DT_RA ) ))
bio_endio(req->private_bio, req->private_bio->bi_size, -EIO);
else
Modified: branches/drbd-8.0-for-linus/drbd/drbd_worker.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_worker.c 2007-07-24 13:18:46 UTC (rev 2991)
+++ branches/drbd-8.0-for-linus/drbd/drbd_worker.c 2007-07-24 13:20:54 UTC (rev 2992)
@@ -325,7 +325,7 @@
number = SLEEP_TIME*mdev->sync_conf.rate / ((BM_BLOCK_SIZE/1024)*HZ);
- if (atomic_read(&mdev->rs_pending_cnt)>number)
+ if (atomic_read(&mdev->rs_pending_cnt) > number)
goto requeue;
number -= atomic_read(&mdev->rs_pending_cnt);
@@ -339,7 +339,7 @@
return 1;
}
- for(i = 0;i<number;i++) {
+ for(i = 0;i < number;i++) {
next_sector:
size = BM_BLOCK_SIZE;
@@ -506,7 +506,7 @@
mdev->state.conn == PausedSyncT) {
if (mdev->p_uuid) {
int i;
- for (i = Bitmap ; i<=History_end ; i++)
+ for (i = Bitmap ; i <= History_end ; i++)
_drbd_uuid_set(mdev, i, mdev->p_uuid[i]);
drbd_uuid_set(mdev, Bitmap, mdev->bc->md.uuid[Current]);
_drbd_uuid_set(mdev, Current, mdev->p_uuid[Current]);
@@ -521,7 +521,7 @@
/* Now the two UUID sets are equal, update what we
* know of the peer. */
int i;
- for (i = Current ; i<=History_end ; i++)
+ for (i = Current ; i <= History_end ; i++)
mdev->p_uuid[i] = mdev->bc->md.uuid[i];
}
}
@@ -868,7 +868,7 @@
MTRACE(TraceTypeResync, TraceLvlSummary,
INFO("Resync starting: side=%s\n",
- side==SyncTarget?"SyncTarget":"SyncSource");
+ side == SyncTarget?"SyncTarget":"SyncSource");
);
drbd_bm_recount_bits(mdev);
Modified: branches/drbd-8.0-for-linus/drbd/lru_cache.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/lru_cache.c 2007-07-24 13:18:46 UTC (rev 2991)
+++ branches/drbd-8.0-for-linus/drbd/lru_cache.c 2007-07-24 13:20:54 UTC (rev 2992)
@@ -67,7 +67,7 @@
lc->new_number = -1;
lc->lc_private = private_p;
lc->name = name;
- for(i = 0;i<e_count;i++) {
+ for(i = 0;i < e_count;i++) {
e = lc_entry(lc, i);
e->lc_number = LC_FREE;
list_add(&e->list, &lc->free);
@@ -354,7 +354,7 @@
int i;
seq_printf(seq, "\tnn: lc_number refcnt %s\n ", utext);
- for(i = 0;i<nr_elements;i++) {
+ for(i = 0;i < nr_elements;i++) {
e = lc_entry(lc, i);
if (e->lc_number == LC_FREE) {
seq_printf(seq, "\t%2d: FREE\n", i );
More information about the drbd-cvs
mailing list