[DRBD-cvs] svn commit by lars - r2988 - in
branches/drbd-8.0-for-linus/drbd: . linux -
b4104ca446c1a446dde5bf7d792ca28ec0783417 fix "need spac
drbd-cvs at lists.linbit.com
drbd-cvs at lists.linbit.com
Tue Jul 24 13:50:18 CEST 2007
Author: lars
Date: 2007-07-24 13:50:16 +0200 (Tue, 24 Jul 2007)
New Revision: 2988
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_proc.c
branches/drbd-8.0-for-linus/drbd/drbd_receiver.c
branches/drbd-8.0-for-linus/drbd/drbd_worker.c
branches/drbd-8.0-for-linus/drbd/linux/drbd.h
branches/drbd-8.0-for-linus/drbd/lru_cache.c
Log:
b4104ca446c1a446dde5bf7d792ca28ec0783417 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 11:44:06 UTC (rev 2987)
+++ branches/drbd-8.0-for-linus/drbd/drbd_actlog.c 2007-07-24 11:50:16 UTC (rev 2988)
@@ -72,7 +72,7 @@
int drbd_md_sync_page_io(drbd_dev *mdev, struct drbd_backing_dev *bdev,
sector_t sector, int rw)
{
- int hardsect, mask, ok, offset=0;
+ int hardsect, mask, ok, offset = 0;
struct page *iop = mdev->md_io_page;
D_ASSERT(semaphore_is_locked(&mdev->md_io_mutex));
@@ -188,7 +188,7 @@
{
struct lc_element *al_ext;
struct bm_extent *bm_ext;
- unsigned long al_flags=0;
+ unsigned long al_flags = 0;
spin_lock_irq(&mdev->al_lock);
bm_ext = (struct bm_extent*) lc_find(mdev->resync, enr/AL_EXT_PER_BM_SECT);
@@ -305,7 +305,7 @@
unsigned int extent_nr;
struct al_transaction* buffer;
sector_t sector;
- u32 xor_sum=0;
+ u32 xor_sum = 0;
struct lc_element *updated = ((struct update_al_work*)w)->al_ext;
unsigned int new_enr = ((struct update_al_work*)w)->enr;
@@ -329,7 +329,7 @@
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);
@@ -342,7 +342,7 @@
xor_sum ^= LC_FREE;
}
mdev->al_tr_cycle += AL_EXTENTS_PT;
- if (mdev->al_tr_cycle >= mdev->act_log->nr_elements) mdev->al_tr_cycle=0;
+ if (mdev->al_tr_cycle >= mdev->act_log->nr_elements) mdev->al_tr_cycle = 0;
buffer->xor_sum = cpu_to_be32(xor_sum);
@@ -356,7 +356,7 @@
}
if ( ++mdev->al_tr_pos > div_ceil(mdev->act_log->nr_elements, AL_EXTENTS_PT) ) {
- mdev->al_tr_pos=0;
+ mdev->al_tr_pos = 0;
}
D_ASSERT(mdev->al_tr_pos < MD_AL_MAX_SIZE);
mdev->al_tr_number++;
@@ -381,7 +381,7 @@
{
sector_t sector;
int rv, i;
- u32 xor_sum=0;
+ u32 xor_sum = 0;
sector = bdev->md.md_offset + bdev->md.al_offset + index;
@@ -393,7 +393,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));
@@ -409,10 +409,10 @@
int drbd_al_read_log(struct Drbd_Conf *mdev, struct drbd_backing_dev *bdev)
{
struct al_transaction* buffer;
- int from=-1, to=-1, i, cnr, overflow=0, rv;
- u32 from_tnr=-1, to_tnr=0;
- int active_extents=0;
- int transactions=0;
+ int from = -1, to = -1, i, cnr, overflow = 0, rv;
+ u32 from_tnr = -1, to_tnr = 0;
+ int active_extents = 0;
+ int transactions = 0;
int mx;
mx = div_ceil(mdev->act_log->nr_elements, AL_EXTENTS_PT);
@@ -424,7 +424,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) {
@@ -434,7 +434,7 @@
cnr = be32_to_cpu(buffer->tr_number);
// INFO("index %d valid tnr=%d\n",i,cnr);
- if (cnr == -1) overflow=1;
+ if (cnr == -1) overflow = 1;
if (cnr < from_tnr && !overflow) {
from = i;
@@ -458,7 +458,7 @@
/* this should better be handled by a for loop, no?
*/
- i=from;
+ i = from;
while(1) {
int j, pos;
unsigned int extent_nr;
@@ -471,7 +471,7 @@
return 0;
}
- trn=be32_to_cpu(buffer->tr_number);
+ trn = be32_to_cpu(buffer->tr_number);
spin_lock_irq(&mdev->al_lock);
@@ -479,7 +479,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);
@@ -496,13 +496,13 @@
cancel:
if (i == to) break;
i++;
- if (i > mx) i=0;
+ if (i > mx) i = 0;
}
mdev->al_tr_number = to_tnr+1;
mdev->al_tr_pos = to;
if ( ++mdev->al_tr_pos > div_ceil(mdev->act_log->nr_elements, AL_EXTENTS_PT) ) {
- mdev->al_tr_pos=0;
+ mdev->al_tr_pos = 0;
}
/* ok, we are done with it */
@@ -524,7 +524,7 @@
STATIC int atodb_endio(struct bio *bio, unsigned int bytes_done, int error)
{
struct drbd_atodb_wait *wc = bio->bi_private;
- struct Drbd_Conf *mdev=wc->mdev;
+ struct Drbd_Conf *mdev = wc->mdev;
struct page *page;
int uptodate = bio_flagged(bio, BIO_UPTODATE);
@@ -538,7 +538,7 @@
}
drbd_chk_io_error(mdev, error, TRUE);
- if (error && wc->error == 0) wc->error=error;
+ if (error && wc->error == 0) wc->error = error;
if (atomic_dec_and_test(&wc->count)) {
complete(&wc->io_done);
@@ -563,14 +563,14 @@
unsigned int enr,
struct drbd_atodb_wait *wc)
{
- int i=0, allocated_page=0;
+ int i = 0, allocated_page = 0;
struct bio *bio;
struct page *np;
sector_t on_disk_sector = enr + mdev->bc->md.md_offset + mdev->bc->md.bm_offset;
int offset;
// check if that enr is already covered by an already created bio.
- while( (bio=bios[i]) ) {
+ while( (bio = bios[i]) ) {
if (bio->bi_sector == on_disk_sector) return 0;
i++;
}
@@ -589,7 +589,7 @@
if (np == NULL) return -ENOMEM;
*page = np;
*page_offset = 0;
- allocated_page=1;
+ allocated_page = 1;
}
offset = S2W(enr);
@@ -632,7 +632,7 @@
unsigned int enr;
struct bio **bios;
struct page *page;
- unsigned int page_offset=PAGE_SIZE;
+ unsigned int page_offset = PAGE_SIZE;
struct drbd_atodb_wait wc;
ERR_IF (!inc_local_if_state(mdev, Attaching))
@@ -650,7 +650,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 */
@@ -666,7 +666,7 @@
wake_up(&mdev->al_wait);
/* all prepared, submit them */
- for(i=0;i<nr_elements;i++) {
+ 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;
@@ -695,9 +695,9 @@
free_bios_submit_one_by_one:
// free everything by calling the endio callback directly.
- for(i=0;i<nr_elements;i++) {
+ for(i = 0;i<nr_elements;i++) {
if (bios[i]==NULL) break;
- bios[i]->bi_size=0;
+ bios[i]->bi_size = 0;
atodb_endio(bios[i], MD_HARDSECT, 0);
}
kfree(bios);
@@ -705,7 +705,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,
@@ -725,13 +725,13 @@
void drbd_al_apply_to_bm(struct Drbd_Conf *mdev)
{
unsigned int enr;
- unsigned long add=0;
+ unsigned long add = 0;
char ppb[10];
int i;
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);
@@ -770,7 +770,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));
@@ -875,7 +875,7 @@
if (ext->rs_left == ext->rs_failed) {
ext->rs_failed = 0;
- udw=kmalloc(sizeof(*udw), GFP_ATOMIC);
+ udw = kmalloc(sizeof(*udw), GFP_ATOMIC);
if (udw) {
udw->enr = ext->lce.lc_number;
udw->w.cb = w_update_odbm;
@@ -906,7 +906,7 @@
unsigned long sbnr, ebnr, lbnr, bnr;
unsigned long count = 0;
sector_t esector, nr_sectors;
- int wake_up=0;
+ int wake_up = 0;
unsigned long flags;
if (size <= 0 || (size & 0x1ff) != 0 || size > DRBD_MAX_SEGMENT_SIZE) {
@@ -946,7 +946,7 @@
* we count rs_{total,left} in bits, not sectors.
*/
spin_lock_irqsave(&mdev->al_lock, flags);
- for(bnr=sbnr; bnr <= ebnr; bnr++) {
+ for(bnr = sbnr; bnr <= ebnr; bnr++) {
if (drbd_bm_clear_bit(mdev, bnr)) count++;
}
if (count) {
@@ -956,8 +956,8 @@
if ( mdev->rs_mark_left != drbd_bm_total_weight(mdev) &&
mdev->state.conn != PausedSyncT &&
mdev->state.conn != PausedSyncS ) {
- mdev->rs_mark_time =jiffies;
- mdev->rs_mark_left =drbd_bm_total_weight(mdev);
+ mdev->rs_mark_time = jiffies;
+ mdev->rs_mark_left = drbd_bm_total_weight(mdev);
}
}
if ( inc_local_if_state(mdev, Attaching) ) {
@@ -966,7 +966,7 @@
}
/* just wake_up unconditional now,
* various lc_chaged(), lc_put() in drbd_try_clear_on_disk_bm(). */
- wake_up=1;
+ wake_up = 1;
}
spin_unlock_irqrestore(&mdev->al_lock, flags);
if (wake_up) wake_up(&mdev->al_wait);
@@ -1054,7 +1054,7 @@
if (bm_ext->lce.refcnt == 1) mdev->resync_locked++;
set_bit(BME_NO_WRITES, &bm_ext->flags);
}
- rs_flags=mdev->resync->flags;
+ rs_flags = mdev->resync->flags;
spin_unlock_irq(&mdev->al_lock);
if (wakeup) wake_up(&mdev->al_wait);
@@ -1074,14 +1074,14 @@
static inline int _is_in_al(drbd_dev* mdev, unsigned int enr)
{
struct lc_element* al_ext;
- int rv=0;
+ int rv = 0;
spin_lock_irq(&mdev->al_lock);
- if (unlikely(enr == mdev->act_log->new_number)) rv=1;
+ if (unlikely(enr == mdev->act_log->new_number)) rv = 1;
else {
al_ext = lc_find(mdev->act_log, enr);
if (al_ext) {
- if (al_ext->refcnt) rv=1;
+ if (al_ext->refcnt) rv = 1;
}
}
spin_unlock_irq(&mdev->al_lock);
@@ -1121,7 +1121,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) {
@@ -1244,7 +1244,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))
@@ -1317,7 +1317,7 @@
spin_lock_irq(&mdev->al_lock);
if (inc_local_if_state(mdev, Failed)) { // Makes sure ->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.
@@ -1326,7 +1326,7 @@
clear_bit(BME_NO_WRITES, &bm_ext->flags);
lc_del(mdev->resync, &bm_ext->lce);
}
- mdev->resync->used=0;
+ mdev->resync->used = 0;
dec_local(mdev);
}
mdev->resync_locked = 0;
@@ -1353,7 +1353,7 @@
spin_lock_irq(&mdev->al_lock);
if (inc_local_if_state(mdev, Failed)) { // Makes sure ->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) {
@@ -1397,7 +1397,7 @@
unsigned long sbnr, ebnr, lbnr, bnr;
unsigned long count = 0;
sector_t esector, nr_sectors;
- int wake_up=0;
+ int wake_up = 0;
MTRACE(TraceTypeResync, TraceLvlSummary,
INFO("drbd_rs_failed_io: sector=%llus, size=%u\n",
@@ -1436,7 +1436,7 @@
* we count rs_{total,left} in bits, not sectors.
*/
spin_lock_irq(&mdev->al_lock);
- for(bnr=sbnr; bnr <= ebnr; bnr++) {
+ for(bnr = sbnr; bnr <= ebnr; bnr++) {
if (drbd_bm_test_bit(mdev, bnr)>0) count++;
}
if (count) {
@@ -1449,7 +1449,7 @@
/* just wake_up unconditional now,
* various lc_chaged(), lc_put() in drbd_try_clear_on_disk_bm(). */
- wake_up=1;
+ wake_up = 1;
}
spin_unlock_irq(&mdev->al_lock);
if (wake_up) wake_up(&mdev->al_wait);
Modified: branches/drbd-8.0-for-linus/drbd/drbd_bitmap.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_bitmap.c 2007-07-24 11:44:06 UTC (rev 2987)
+++ branches/drbd-8.0-for-linus/drbd/drbd_bitmap.c 2007-07-24 11:50:16 UTC (rev 2988)
@@ -286,7 +286,7 @@
{
const unsigned long mask = (1UL << (b->bm_bits & (BITS_PER_LONG-1))) -1;
size_t w = b->bm_bits >> LN2_BPL;
- int cleared=0;
+ int cleared = 0;
if (w < b->bm_words) {
cleared = hweight_long(b->bm[w] & ~mask);
@@ -295,7 +295,7 @@
if (w < b->bm_words) {
cleared += hweight_long(b->bm[w]);
- b->bm[w++]=0;
+ b->bm[w++] = 0;
}
return cleared;
@@ -831,7 +831,7 @@
int drbd_bm_read(struct Drbd_Conf *mdev)
{
struct drbd_bitmap *b = mdev->bitmap;
- int err=0;
+ int err = 0;
if (b->bm) {
// bitmap size > 0
Modified: branches/drbd-8.0-for-linus/drbd/drbd_int.h
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_int.h 2007-07-24 11:44:06 UTC (rev 2987)
+++ branches/drbd-8.0-for-linus/drbd/drbd_int.h 2007-07-24 11:50:16 UTC (rev 2988)
@@ -171,10 +171,10 @@
if (lost) \
WARN("%d messages suppressed in %s:%d.\n", \
lost , __FILE__ , __LINE__ ); \
- __ret=1; \
+ __ret = 1; \
} else { \
missed++; \
- __ret=0; \
+ __ret = 0; \
} \
__ret; \
})
@@ -1406,17 +1406,17 @@
#define user_isp_mask 1
#define aftr_isp_mask 1
-#define NS(T, S) ({drbd_state_t mask; mask.i=0; mask.T = T##_mask; mask;}), \
- ({drbd_state_t val; val.i=0; val.T = (S); val;})
+#define NS(T, S) ({drbd_state_t mask; mask.i = 0; mask.T = T##_mask; mask;}), \
+ ({drbd_state_t val; val.i = 0; val.T = (S); val;})
#define NS2(T1, S1, T2, S2) \
- ({drbd_state_t mask; mask.i=0; mask.T1 = T1##_mask; \
+ ({drbd_state_t mask; mask.i = 0; mask.T1 = T1##_mask; \
mask.T2 = T2##_mask; mask;}), \
- ({drbd_state_t val; val.i=0; val.T1 = (S1); \
+ ({drbd_state_t val; val.i = 0; val.T1 = (S1); \
val.T2 = (S2); val;})
#define NS3(T1, S1, T2, S2, T3, S3) \
- ({drbd_state_t mask; mask.i=0; mask.T1 = T1##_mask; \
+ ({drbd_state_t mask; mask.i = 0; mask.T1 = T1##_mask; \
mask.T2 = T2##_mask; mask.T3 = T3##_mask; mask;}), \
- ({drbd_state_t val; val.i=0; val.T1 = (S1); \
+ ({drbd_state_t val; val.i = 0; val.T1 = (S1); \
val.T2 = (S2); val.T3 = (S3); val;})
#define _NS(D, T, S) D, ({drbd_state_t ns; ns.i = D->state.i; ns.T = (S); ns;})
Modified: branches/drbd-8.0-for-linus/drbd/drbd_main.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_main.c 2007-07-24 11:44:06 UTC (rev 2987)
+++ branches/drbd-8.0-for-linus/drbd/drbd_main.c 2007-07-24 11:50:16 UTC (rev 2988)
@@ -104,9 +104,9 @@
int allow_oos = 0;
#ifdef ENABLE_DYNAMIC_TRACE
-int trace_type = 0; // Bitmap of trace types to enable
-int trace_level= 0; // Current trace level
-int trace_devs = 0; // Bitmap of devices to trace
+int trace_type = 0; // Bitmap of trace types to enable
+int trace_level = 0; // Current trace level
+int trace_devs = 0; // Bitmap of devices to trace
module_param(trace_level, int, 0644);
module_param(trace_type, int, 0644);
@@ -158,13 +158,13 @@
{
struct drbd_barrier *b;
- b=kmalloc(sizeof(struct drbd_barrier), GFP_KERNEL);
+ b = kmalloc(sizeof(struct drbd_barrier), GFP_KERNEL);
if (!b) return 0;
INIT_LIST_HEAD(&b->requests);
INIT_LIST_HEAD(&b->w.list);
- b->next=0;
- b->br_number=4711;
- b->n_req=0;
+ b->next = 0;
+ b->br_number = 4711;
+ b->n_req = 0;
mdev->oldest_barrier = b;
mdev->newest_barrier = b;
@@ -196,8 +196,8 @@
INIT_LIST_HEAD(&new->requests);
INIT_LIST_HEAD(&new->w.list);
- new->next=0;
- new->n_req=0;
+ new->next = 0;
+ new->n_req = 0;
newest_before = mdev->newest_barrier;
/* never send a barrier number == 0, because that is special-cased
@@ -281,8 +281,8 @@
if (b == mdev->newest_barrier) {
D_ASSERT(tmp == NULL);
- b->br_number=4711;
- b->n_req=0;
+ b->br_number = 4711;
+ b->n_req = 0;
INIT_LIST_HEAD(&b->requests);
mdev->oldest_barrier = b;
break;
@@ -316,7 +316,7 @@
{
enum io_error_handler eh;
unsigned long flags;
- int send, ok=1;
+ int send, ok = 1;
eh = PassOn;
if (inc_local_if_state(mdev, Failed)) {
@@ -410,7 +410,7 @@
if (test_and_clear_bit(CL_ST_CHG_FAIL, &mdev->flags))
return SS_CW_FailedByPeer;
- rv=0;
+ rv = 0;
spin_lock_irqsave(&mdev->req_lock, flags);
os = mdev->state;
ns.i = (os.i & ~mask.i) | val.i;
@@ -462,7 +462,7 @@
return rv;
}
- wait_event(mdev->state_wait, (rv=_req_st_cond(mdev, mask, val)));
+ wait_event(mdev->state_wait, (rv = _req_st_cond(mdev, mask, val)));
if (rv < SS_Success) {
// nearly dead code.
@@ -530,7 +530,7 @@
/* See drbd_state_sw_errors in drbd_strings.c */
enum fencing_policy fp;
- int rv=SS_Success;
+ int rv = SS_Success;
fp = DontCare;
if (inc_local(mdev)) {
@@ -541,53 +541,53 @@
if (inc_net(mdev)) {
if ( !mdev->net_conf->two_primaries &&
ns.role == Primary && ns.peer == Primary )
- rv=SS_TwoPrimaries;
+ rv = SS_TwoPrimaries;
dec_net(mdev);
}
if (rv <= 0) /* already found a reason to abort */;
else if (ns.role == Secondary && mdev->open_cnt)
- rv=SS_DeviceInUse;
+ rv = SS_DeviceInUse;
else if ( ns.role == Primary && ns.conn < Connected &&
- ns.disk < UpToDate ) rv=SS_NoUpToDateDisk;
+ ns.disk < UpToDate ) rv = SS_NoUpToDateDisk;
else if ( fp >= Resource &&
ns.role == Primary && ns.conn < Connected &&
- ns.pdsk >= DUnknown ) rv=SS_PrimaryNOP;
+ ns.pdsk >= DUnknown ) rv = SS_PrimaryNOP;
else if ( ns.role == Primary && ns.disk <= Inconsistent &&
- ns.pdsk <= Inconsistent ) rv=SS_NoUpToDateDisk;
+ ns.pdsk <= Inconsistent ) rv = SS_NoUpToDateDisk;
else if ( ns.conn > Connected &&
ns.disk < UpToDate && ns.pdsk < UpToDate )
- rv=SS_BothInconsistent;
+ rv = SS_BothInconsistent;
else if ( ns.conn > Connected &&
(ns.disk == Diskless || ns.pdsk == Diskless ) )
- rv=SS_SyncingDiskless;
+ rv = SS_SyncingDiskless;
else if ( (ns.conn == Connected ||
ns.conn == WFBitMapS ||
ns.conn == SyncSource ||
ns.conn == PausedSyncS) &&
- ns.disk == Outdated ) rv=SS_ConnectedOutdates;
+ ns.disk == Outdated ) rv = SS_ConnectedOutdates;
return rv;
}
STATIC int is_valid_state_transition(drbd_dev* mdev, drbd_state_t ns, drbd_state_t os)
{
- int rv=SS_Success;
+ int rv = SS_Success;
if ( (ns.conn == StartingSyncT || ns.conn == StartingSyncS ) &&
- os.conn > Connected) rv=SS_ResyncRunning;
+ os.conn > Connected) rv = SS_ResyncRunning;
if (ns.conn == Disconnecting && os.conn == StandAlone)
- rv=SS_AlreadyStandAlone;
+ rv = SS_AlreadyStandAlone;
if (ns.disk > Attaching && os.disk == Diskless)
- rv=SS_IsDiskLess;
+ rv = SS_IsDiskLess;
return rv;
}
@@ -595,7 +595,7 @@
int _drbd_set_state(drbd_dev* mdev, drbd_state_t ns, enum chg_state_flags flags)
{
drbd_state_t os;
- int rv=SS_Success, warn_sync_abort=0;
+ int rv = SS_Success, warn_sync_abort = 0;
enum fencing_policy fp;
MUST_HOLD(&mdev->req_lock);
@@ -641,7 +641,7 @@
}
if ( ns.conn > Connected && (ns.disk <= Failed || ns.pdsk <= Failed )) {
- warn_sync_abort=1;
+ warn_sync_abort = 1;
ns.conn = Connected;
}
@@ -706,11 +706,11 @@
}
if (ns.aftr_isp || ns.peer_isp || ns.user_isp) {
- if (ns.conn == SyncSource) ns.conn=PausedSyncS;
- if (ns.conn == SyncTarget) ns.conn=PausedSyncT;
+ if (ns.conn == SyncSource) ns.conn = PausedSyncS;
+ if (ns.conn == SyncTarget) ns.conn = PausedSyncT;
} else {
- if (ns.conn == PausedSyncS) ns.conn=SyncSource;
- if (ns.conn == PausedSyncT) ns.conn=SyncTarget;
+ if (ns.conn == PausedSyncS) ns.conn = SyncSource;
+ if (ns.conn == PausedSyncT) ns.conn = SyncTarget;
}
if (ns.i == os.i) return SS_NothingToDo;
@@ -748,7 +748,7 @@
{
char *pbp, pb[300];
pbp = pb;
- *pbp=0;
+ *pbp = 0;
PSC(role);
PSC(peer);
PSC(conn);
@@ -1402,7 +1402,7 @@
int _drbd_send_bitmap(drbd_dev *mdev)
{
int want;
- int ok=TRUE, bm_i=0;
+ int ok = TRUE, bm_i = 0;
size_t bm_words, num_words;
unsigned long *buffer;
Drbd_Header *p;
@@ -1452,7 +1452,7 @@
if (!drbd_get_data_sock(mdev))
return 0;
- ok=_drbd_send_bitmap(mdev);
+ ok = _drbd_send_bitmap(mdev);
drbd_put_data_sock(mdev);
return ok;
}
@@ -1488,7 +1488,7 @@
p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq));
if (!mdev->meta.socket || mdev->state.conn < Connected) return FALSE;
- ok=drbd_send_cmd(mdev, USE_META_SOCKET, cmd, (Drbd_Header*)&p, sizeof(p));
+ ok = drbd_send_cmd(mdev, USE_META_SOCKET, cmd, (Drbd_Header*)&p, sizeof(p));
return ok;
}
@@ -1680,9 +1680,9 @@
*/
int drbd_send_dblock(drbd_dev *mdev, drbd_request_t *req)
{
- int ok=1;
+ int ok = 1;
Drbd_Data_Packet p;
- unsigned int dp_flags=0;
+ unsigned int dp_flags = 0;
if (!drbd_get_data_sock(mdev))
return 0;
@@ -1782,7 +1782,7 @@
struct kvec iov;
#endif
struct msghdr msg;
- int rv, sent=0;
+ int rv, sent = 0;
if (!sock) return -1000;
@@ -1872,7 +1872,7 @@
{
drbd_dev *mdev;
unsigned long flags;
- int rv=0;
+ int rv = 0;
mdev = minor_to_mdev(MINOR(inode->i_rdev));
if (!mdev) return -ENODEV;
@@ -2176,7 +2176,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);
@@ -2217,7 +2217,7 @@
if (minor_table) {
if (drbd_proc)
remove_proc_entry("drbd", &proc_root);
- i=minor_count;
+ i = minor_count;
while (i--) {
drbd_dev *mdev = minor_to_mdev(i);
struct gendisk **disk = &mdev->vdisk;
@@ -2351,7 +2351,7 @@
// no need to lock access, we are still initializing the module.
if (!tl_init(mdev)) goto Enomem;
- mdev->app_reads_hash=kzalloc(APP_R_HSIZE*sizeof(void*), GFP_KERNEL);
+ mdev->app_reads_hash = kzalloc(APP_R_HSIZE*sizeof(void*), GFP_KERNEL);
if (!mdev->app_reads_hash) goto Enomem;
return mdev;
@@ -2487,7 +2487,7 @@
}
drbd_free_sock(mdev);
drbd_free_bc(mdev->bc);
- mdev->bc=0;
+ mdev->bc = 0;
}
/*********************************/
@@ -2533,9 +2533,9 @@
buffer = (struct meta_data_on_disk *)page_address(mdev->md_io_page);
memset(buffer, 0, 512);
- buffer->la_size=cpu_to_be64(drbd_get_capacity(mdev->this_bdev));
+ buffer->la_size = cpu_to_be64(drbd_get_capacity(mdev->this_bdev));
for (i = Current; i < UUID_SIZE; i++)
- buffer->uuid[i]=cpu_to_be64(mdev->bc->md.uuid[i]);
+ buffer->uuid[i] = cpu_to_be64(mdev->bc->md.uuid[i]);
buffer->flags = cpu_to_be32(mdev->bc->md.flags);
buffer->magic = cpu_to_be32(DRBD_MD_MAGIC);
@@ -2634,7 +2634,7 @@
bdev->md.la_size_sect = be64_to_cpu(buffer->la_size);
for (i = Current; i < UUID_SIZE; i++)
- bdev->md.uuid[i]=be64_to_cpu(buffer->uuid[i]);
+ bdev->md.uuid[i] = be64_to_cpu(buffer->uuid[i]);
bdev->md.flags = be32_to_cpu(buffer->flags);
mdev->sync_conf.al_extents = be32_to_cpu(buffer->al_nr_extents);
bdev->md.device_uuid = be64_to_cpu(buffer->device_uuid);
@@ -2669,7 +2669,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,
@@ -2702,7 +2702,7 @@
{
if (mdev->bc->md.uuid[idx]) {
drbd_uuid_move_history(mdev);
- mdev->bc->md.uuid[History_start]=mdev->bc->md.uuid[idx];
+ mdev->bc->md.uuid[History_start] = mdev->bc->md.uuid[idx];
MTRACE(TraceTypeUuid, TraceLvlMetrics,
drbd_print_uuid(mdev, History_start);
);
@@ -2739,8 +2739,8 @@
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;
+ mdev->bc->md.uuid[History_start] = mdev->bc->md.uuid[Bitmap];
+ mdev->bc->md.uuid[Bitmap] = 0;
MTRACE(TraceTypeUuid, TraceLvlMetrics,
drbd_print_uuid(mdev, History_start);
@@ -2920,8 +2920,8 @@
const unsigned char *pstart_va;
const unsigned char *pend;
char bytes_str[LINE_SIZE*3+8], ascii_str[LINE_SIZE+8];
- char *pbytes=bytes_str, *pascii=ascii_str;
- int offset=0;
+ char *pbytes = bytes_str, *pascii = ascii_str;
+ int offset = 0;
long sizemask;
int field_width;
int index;
@@ -2962,7 +2962,7 @@
// Start at beginning of first line
p = pstart;
- count=0;
+ count = 0;
while (p < pend_str) {
if (p < (const unsigned char *)buffer || p >= pend) {
@@ -3033,7 +3033,7 @@
STATIC char *dump_st(char *p, int len, drbd_state_t mask, drbd_state_t val)
{
- char *op=p;
+ char *op = p;
*p = '\0';
PSM(role);
PSM(peer);
Modified: branches/drbd-8.0-for-linus/drbd/drbd_nl.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_nl.c 2007-07-24 11:44:06 UTC (rev 2987)
+++ branches/drbd-8.0-for-linus/drbd/drbd_nl.c 2007-07-24 11:50:16 UTC (rev 2988)
@@ -197,7 +197,7 @@
if (fp == Stonith) drbd_request_state(mdev, NS(susp, 1));
- r=drbd_khelper(mdev, "outdate-peer");
+ r = drbd_khelper(mdev, "outdate-peer");
switch( (r>>8) & 0xff ) {
case 3: /* peer is inconsistent */
@@ -236,7 +236,7 @@
int drbd_set_role(drbd_dev *mdev, drbd_role_t new_role, int force)
{
- int r=0, forced = 0, try=0;
+ int r = 0, forced = 0, try = 0;
drbd_state_t mask, val;
drbd_disks_t nps;
@@ -373,7 +373,7 @@
memset(&primary_args, 0, sizeof(struct primary));
if (!primary_from_tags(mdev, nlp->tag_list, &primary_args)) {
- reply->ret_code=UnknownMandatoryTag;
+ reply->ret_code = UnknownMandatoryTag;
return 0;
}
@@ -458,7 +458,7 @@
char ppb[10];
int md_moved, la_size_changed;
- int rv=0;
+ int rv = 0;
wait_event(mdev->al_wait, lc_try_lock(mdev->act_log));
@@ -530,20 +530,20 @@
sector_t la_size = bdev->md.la_size_sect; // last agreed size.
sector_t m_size; // my size
sector_t u_size = bdev->dc.disk_size; // size requested by user.
- sector_t size=0;
+ sector_t size = 0;
m_size = drbd_get_max_capacity(bdev);
if (p_size && m_size) {
- size=min_t(sector_t, p_size, m_size);
+ size = min_t(sector_t, p_size, m_size);
} else {
if (la_size) {
- size=la_size;
- if (m_size && m_size < size) size=m_size;
- if (p_size && p_size < size) size=p_size;
+ size = la_size;
+ if (m_size && m_size < size) size = m_size;
+ if (p_size && p_size < size) size = p_size;
} else {
- if (m_size) size=m_size;
- if (p_size) size=p_size;
+ if (m_size) size = m_size;
+ if (p_size) size = p_size;
}
}
@@ -595,7 +595,7 @@
}
spin_lock_irq(&mdev->al_lock);
if (t) {
- for (i=0; i < t->nr_elements; i++) {
+ for (i = 0; i < t->nr_elements; i++) {
e = lc_entry(t, i);
if (e->refcnt)
ERR("refcnt(%d)==%d\n",
@@ -683,15 +683,15 @@
struct drbd_nl_cfg_reply *reply)
{
enum ret_codes retcode;
- struct drbd_backing_dev* nbc=NULL; // new_backing_conf
+ struct drbd_backing_dev* nbc = NULL; // new_backing_conf
struct inode *inode, *inode2;
struct lru_cache* resync_lru = NULL;
drbd_state_t ns, os;
- int rv, ntries=0;
+ int rv, ntries = 0;
/* if you want to reconfigure, please tear down first */
if (mdev->state.disk > Diskless) {
- retcode=HaveDiskConfig;
+ retcode = HaveDiskConfig;
goto fail;
}
@@ -702,7 +702,7 @@
while(mdev->bc != NULL) {
if (ntries++ >= 5) {
WARN("drbd_nl_disk_conf: mdev->bc not NULL.\n");
- retcode=HaveDiskConfig;
+ retcode = HaveDiskConfig;
goto fail;
}
set_current_state(TASK_INTERRUPTIBLE);
@@ -711,7 +711,7 @@
nbc = kmalloc(sizeof(struct drbd_backing_dev), GFP_KERNEL);
if (!nbc) {
- retcode=KMallocFailed;
+ retcode = KMallocFailed;
goto fail;
}
@@ -726,7 +726,7 @@
}
if (!disk_conf_from_tags(mdev, nlp->tag_list, &nbc->dc)) {
- retcode=UnknownMandatoryTag;
+ retcode = UnknownMandatoryTag;
goto fail;
}
@@ -734,7 +734,7 @@
nbc->md_file = NULL;
if (nbc->dc.meta_dev_idx < DRBD_MD_INDEX_FLEX_INT) {
- retcode=LDMDInvalid;
+ retcode = LDMDInvalid;
goto fail;
}
@@ -742,15 +742,15 @@
if (IS_ERR(nbc->lo_file)) {
ERR("open(\"%s\") failed with %ld\n", nbc->dc.backing_dev,
PTR_ERR(nbc->lo_file));
- nbc->lo_file=NULL;
- retcode=LDNameInvalid;
+ nbc->lo_file = NULL;
+ retcode = LDNameInvalid;
goto fail;
}
inode = nbc->lo_file->f_dentry->d_inode;
if (!S_ISBLK(inode->i_mode)) {
- retcode=LDNoBlockDev;
+ retcode = LDNoBlockDev;
goto fail;
}
@@ -758,15 +758,15 @@
if (IS_ERR(nbc->md_file)) {
ERR("open(\"%s\") failed with %ld\n", nbc->dc.meta_dev,
PTR_ERR(nbc->md_file));
- nbc->md_file=NULL;
- retcode=MDNameInvalid;
+ nbc->md_file = NULL;
+ retcode = MDNameInvalid;
goto fail;
}
inode2 = nbc->md_file->f_dentry->d_inode;
if (!S_ISBLK(inode2->i_mode)) {
- retcode=MDNoBlockDev;
+ retcode = MDNoBlockDev;
goto fail;
}
@@ -777,13 +777,13 @@
nbc->backing_bdev->bd_holder,
nbc->backing_bdev->bd_contains->bd_holder,
nbc->backing_bdev->bd_holders);
- retcode=LDMounted;
+ retcode = LDMounted;
goto fail;
}
resync_lru = lc_alloc("resync", 31, sizeof(struct bm_extent), mdev);
if (!resync_lru) {
- retcode=KMallocFailed;
+ retcode = KMallocFailed;
goto fail;
}
@@ -792,14 +792,14 @@
(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;
+ 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) ) {
- retcode=LDMDInvalid;
+ retcode = LDMDInvalid;
goto release_bdev2_fail;
}
@@ -1054,13 +1054,13 @@
char hmac_name[HMAC_NAME_L];
if (mdev->state.conn > StandAlone) {
- retcode=HaveNetConfig;
+ retcode = HaveNetConfig;
goto fail;
}
new_conf = kmalloc(sizeof(struct net_conf), GFP_KERNEL);
if (!new_conf) {
- retcode=KMallocFailed;
+ retcode = KMallocFailed;
goto fail;
}
@@ -1069,36 +1069,36 @@
dec_local(mdev);
} else {
memset(new_conf, 0, sizeof(struct net_conf));
- new_conf->timeout = DRBD_TIMEOUT_DEF;
- new_conf->try_connect_int = DRBD_CONNECT_INT_DEF;
- new_conf->ping_int = DRBD_PING_INT_DEF;
- new_conf->max_epoch_size = DRBD_MAX_EPOCH_SIZE_DEF;
- new_conf->max_buffers = DRBD_MAX_BUFFERS_DEF;
- new_conf->unplug_watermark= DRBD_UNPLUG_WATERMARK_DEF;
- new_conf->sndbuf_size = DRBD_SNDBUF_SIZE_DEF;
- new_conf->ko_count = DRBD_KO_COUNT_DEF;
- new_conf->after_sb_0p = DRBD_AFTER_SB_0P_DEF;
- new_conf->after_sb_1p = DRBD_AFTER_SB_1P_DEF;
- new_conf->after_sb_2p = DRBD_AFTER_SB_2P_DEF;
- new_conf->want_lose = 0;
- new_conf->two_primaries = 0;
- new_conf->wire_protocol = DRBD_PROT_C;
- new_conf->ping_timeo = DRBD_PING_TIMEO_DEF;
- new_conf->rr_conflict = DRBD_RR_CONFLICT_DEF;
+ new_conf->timeout = DRBD_TIMEOUT_DEF;
+ new_conf->try_connect_int = DRBD_CONNECT_INT_DEF;
+ new_conf->ping_int = DRBD_PING_INT_DEF;
+ new_conf->max_epoch_size = DRBD_MAX_EPOCH_SIZE_DEF;
+ new_conf->max_buffers = DRBD_MAX_BUFFERS_DEF;
+ new_conf->unplug_watermark = DRBD_UNPLUG_WATERMARK_DEF;
+ new_conf->sndbuf_size = DRBD_SNDBUF_SIZE_DEF;
+ new_conf->ko_count = DRBD_KO_COUNT_DEF;
+ new_conf->after_sb_0p = DRBD_AFTER_SB_0P_DEF;
+ new_conf->after_sb_1p = DRBD_AFTER_SB_1P_DEF;
+ new_conf->after_sb_2p = DRBD_AFTER_SB_2P_DEF;
+ new_conf->want_lose = 0;
+ new_conf->two_primaries = 0;
+ new_conf->wire_protocol = DRBD_PROT_C;
+ new_conf->ping_timeo = DRBD_PING_TIMEO_DEF;
+ new_conf->rr_conflict = DRBD_RR_CONFLICT_DEF;
}
if (!net_conf_from_tags(mdev, nlp->tag_list, new_conf)) {
- retcode=UnknownMandatoryTag;
+ retcode = UnknownMandatoryTag;
goto fail;
}
if (new_conf->two_primaries && (new_conf->wire_protocol != DRBD_PROT_C)) {
- retcode=ProtocolCRequired;
+ retcode = ProtocolCRequired;
goto fail;
};
if (mdev->state.role == Primary && new_conf->want_lose) {
- retcode=DiscardNotAllowed;
+ retcode = DiscardNotAllowed;
goto fail;
}
@@ -1107,17 +1107,17 @@
#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)) {
if ( M_ADDR(new_conf) == M_ADDR(odev->net_conf) &&
M_PORT(new_conf) == M_PORT(odev->net_conf) ) {
- retcode=LAAlreadyInUse;
+ retcode = LAAlreadyInUse;
}
if (O_ADDR(new_conf) == O_ADDR(odev->net_conf) &&
O_PORT(new_conf) == O_PORT(odev->net_conf) ) {
- retcode=OAAlreadyInUse;
+ retcode = OAAlreadyInUse;
}
dec_net(odev);
if (retcode != NoError) goto fail;
@@ -1133,12 +1133,12 @@
tfm = crypto_alloc_hash(hmac_name, 0, CRYPTO_ALG_ASYNC);
if (IS_ERR(tfm)) {
tfm = NULL;
- retcode=CRAMAlgNotAvail;
+ retcode = CRAMAlgNotAvail;
goto fail;
}
if (crypto_tfm_alg_type(crypto_hash_tfm(tfm)) != CRYPTO_ALG_TYPE_HASH ) {
- retcode=CRAMAlgNotDigest;
+ retcode = CRAMAlgNotDigest;
goto fail;
}
}
@@ -1146,23 +1146,23 @@
ns = new_conf->max_epoch_size/8;
if (mdev->tl_hash_s != ns) {
- new_tl_hash=kzalloc(ns*sizeof(void*), GFP_KERNEL);
+ new_tl_hash = kzalloc(ns*sizeof(void*), GFP_KERNEL);
if (!new_tl_hash) {
- retcode=KMallocFailed;
+ retcode = KMallocFailed;
goto fail;
}
}
ns = new_conf->max_buffers/8;
if (new_conf->two_primaries && ( mdev->ee_hash_s != ns ) ) {
- new_ee_hash=kzalloc(ns*sizeof(void*), GFP_KERNEL);
+ new_ee_hash = kzalloc(ns*sizeof(void*), GFP_KERNEL);
if (!new_ee_hash) {
- retcode=KMallocFailed;
+ retcode = KMallocFailed;
goto fail;
}
}
- ((char*)new_conf->shared_secret)[SHARED_SECRET_MAX-1]=0;
+ ((char*)new_conf->shared_secret)[SHARED_SECRET_MAX-1] = 0;
#if 0
FIXME LGE
@@ -1272,11 +1272,11 @@
struct drbd_nl_cfg_reply *reply)
{
struct resize rs;
- int retcode=NoError;
+ int retcode = NoError;
memset(&rs, 0, sizeof(struct resize));
if (!resize_from_tags(mdev, nlp->tag_list, &rs)) {
- retcode=UnknownMandatoryTag;
+ retcode = UnknownMandatoryTag;
goto fail;
}
@@ -1315,7 +1315,7 @@
STATIC int drbd_nl_syncer_conf(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
- int retcode=NoError;
+ int retcode = NoError;
struct syncer_conf sc;
drbd_dev *odev;
int err;
@@ -1329,19 +1329,19 @@
}
if (!syncer_conf_from_tags(mdev, nlp->tag_list, &sc)) {
- retcode=UnknownMandatoryTag;
+ retcode = UnknownMandatoryTag;
goto fail;
}
if (sc.after != -1) {
if ( sc.after < -1 || minor_to_mdev(sc.after) == NULL ) {
- retcode=SyncAfterInvalid;
+ retcode = SyncAfterInvalid;
goto fail;
}
odev = minor_to_mdev(sc.after); // check against loops in
while(1) {
if (odev == mdev) {
- retcode=SyncAfterCycle;
+ retcode = SyncAfterCycle;
goto fail;
}
if (odev->sync_conf.after == -1) break; // no cycles.
@@ -1402,7 +1402,7 @@
STATIC int drbd_nl_pause_sync(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
- int retcode=NoError;
+ int retcode = NoError;
if (drbd_request_state(mdev, NS(user_isp, 1)) == SS_NothingToDo)
retcode = PauseFlagAlreadySet;
@@ -1414,7 +1414,7 @@
STATIC int drbd_nl_resume_sync(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
- int retcode=NoError;
+ int retcode = NoError;
if (drbd_request_state(mdev, NS(user_isp, 0)) == SS_NothingToDo)
retcode = PauseFlagAlreadyClear;
@@ -1515,12 +1515,12 @@
*tl++ = T_uuids;
*tl++ = UUID_SIZE*sizeof(u64);
memcpy(tl, mdev->bc->md.uuid, UUID_SIZE*sizeof(u64));
- tl=(unsigned short*)((char*)tl + UUID_SIZE*sizeof(u64));
+ tl = (unsigned short*)((char*)tl + UUID_SIZE*sizeof(u64));
dec_local(mdev);
*tl++ = T_uuids_flags;
*tl++ = sizeof(int);
memcpy(tl, &mdev->bc->md.flags, sizeof(int));
- tl=(unsigned short*)((char*)tl + sizeof(int));
+ tl = (unsigned short*)((char*)tl + sizeof(int));
}
*tl++ = TT_END; /* Close the tag list */
@@ -1539,7 +1539,7 @@
*tl++ = T_use_degraded;
*tl++ = sizeof(char);
*((char*)tl) = test_bit(USE_DEGR_WFC_T, &mdev->flags) ? 1 : 0 ;
- tl=(unsigned short*)((char*)tl + sizeof(char));
+ tl = (unsigned short*)((char*)tl + sizeof(char));
*tl++ = TT_END;
return (int)((char*)tl - (char*)reply->tag_list);
@@ -1629,14 +1629,14 @@
}
if ( !(mdev = ensure_mdev(nlp)) ) {
- retcode=MinorNotKnown;
+ retcode = MinorNotKnown;
goto fail;
}
TRACE(TraceTypeNl, TraceLvlSummary, nl_trace_packet(data););
if (nlp->packet_type >= P_nl_after_last_packet) {
- retcode=UnknownNetLinkPacket;
+ retcode = UnknownNetLinkPacket;
goto fail;
}
@@ -1644,7 +1644,7 @@
reply_size += cm->reply_body_size;
if ( !(cn_reply = kmalloc(reply_size, GFP_KERNEL)) ) {
- retcode=KMallocFailed;
+ retcode = KMallocFailed;
goto fail;
}
reply = (struct drbd_nl_cfg_reply*) cn_reply->data;
@@ -1728,7 +1728,7 @@
*tl++ = T_helper;
*tl++ = str_len;
memcpy(tl, helper_name, str_len);
- tl=(unsigned short*)((char*)tl + str_len);
+ tl = (unsigned short*)((char*)tl + str_len);
*tl++ = TT_END; /* Close the tag list */
cn_reply->id.idx = CN_IDX_DRBD;
@@ -1777,7 +1777,7 @@
*tl++ = T_sync_progress;
*tl++ = sizeof(int);
memcpy(tl, &res, sizeof(int));
- tl=(unsigned short*)((char*)tl + sizeof(int));
+ tl = (unsigned short*)((char*)tl + sizeof(int));
}
*tl++ = TT_END; /* Close the tag list */
Modified: branches/drbd-8.0-for-linus/drbd/drbd_proc.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_proc.c 2007-07-24 11:44:06 UTC (rev 2987)
+++ branches/drbd-8.0-for-linus/drbd/drbd_proc.c 2007-07-24 11:50:16 UTC (rev 2988)
@@ -146,7 +146,7 @@
/* mean speed since syncer started
* we do account for PausedSync periods */
dt = (jiffies - mdev->rs_start - mdev->rs_paused) / HZ;
- if (dt <= 0) dt=1;
+ if (dt <= 0) dt = 1;
db = mdev->rs_total - rs_left;
dbdt = Bit2KB(db/dt);
if (dbdt > 1000)
@@ -172,7 +172,7 @@
STATIC int drbd_seq_show(struct seq_file *seq, void *v)
{
- int i, hole=0;
+ int i, hole = 0;
const char *sn;
drbd_dev *mdev;
@@ -195,11 +195,11 @@
for (i = 0; i < minor_count; i++) {
mdev = minor_to_mdev(i);
if (!mdev) {
- hole=1;
+ hole = 1;
continue;
}
if (hole) {
- hole=0;
+ hole = 0;
seq_printf( seq, "\n");
}
Modified: branches/drbd-8.0-for-linus/drbd/drbd_receiver.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_receiver.c 2007-07-24 11:44:06 UTC (rev 2987)
+++ branches/drbd-8.0-for-linus/drbd/drbd_receiver.c 2007-07-24 11:50:16 UTC (rev 2988)
@@ -70,12 +70,12 @@
void check_list(drbd_dev *mdev, struct list_head *list, char *t)
{
struct list_head *le, *la;
- int forward=0, backward=0;
+ int forward = 0, backward = 0;
- le=list;
+ le = list;
do {
- la=le;
- le=le->next;
+ la = le;
+ le = le->next;
if (le->prev != la) {
printk(KERN_ERR DEVICE_NAME
"%d: %s list fucked.\n",
@@ -90,10 +90,10 @@
}
} while(le != list);
- le=list;
+ le = list;
do {
- la=le;
- le=le->prev;
+ la = le;
+ le = le->prev;
if (le->next != la) {
printk(KERN_ERR DEVICE_NAME
"%d: %s list fucked.\n",
@@ -122,7 +122,7 @@
*/
STATIC struct page * drbd_pp_alloc(drbd_dev *mdev, unsigned int gfp_mask)
{
- unsigned long flags=0;
+ unsigned long flags = 0;
struct page *page;
DEFINE_WAIT(wait);
@@ -190,7 +190,7 @@
STATIC void drbd_pp_free(drbd_dev *mdev, struct page *page)
{
- unsigned long flags=0;
+ unsigned long flags = 0;
int free_it;
spin_lock_irqsave(&drbd_pp_lock, flags);
@@ -327,7 +327,7 @@
void drbd_free_ee(drbd_dev *mdev, struct Tl_epoch_entry* e)
{
- struct bio *bio=e->private_bio;
+ struct bio *bio = e->private_bio;
struct bio_vec *bvec;
int i;
@@ -350,7 +350,7 @@
/* currently on module unload only */
int drbd_release_ee(drbd_dev *mdev, struct list_head* list)
{
- int count=0;
+ int count = 0;
struct Tl_epoch_entry* e;
struct list_head *le;
@@ -400,7 +400,7 @@
{
LIST_HEAD(work_list);
struct Tl_epoch_entry *e, *t;
- int ok=1;
+ int ok = 1;
int do_clear_bit = test_bit(WRITE_ACK_PENDING, &mdev->flags);
spin_lock_irq(&mdev->req_lock);
@@ -722,8 +722,8 @@
msock = NULL;
do {
- for(try=0;;) { // 3 tries, this should take less than a second!
- s=drbd_try_connect(mdev);
+ for(try = 0;;) { // 3 tries, this should take less than a second!
+ s = drbd_try_connect(mdev);
if (s || ++try >= 3) break;
// give the other side time to call bind() & listen()
set_current_state(TASK_INTERRUPTIBLE);
@@ -753,7 +753,7 @@
if (sock && msock) break;
- s=drbd_wait_for_connect(mdev);
+ s = drbd_wait_for_connect(mdev);
if (s) {
switch(drbd_recv_fp(mdev, s)) {
case HandShakeS:
@@ -784,13 +784,13 @@
} while( !sock || !msock );
- msock->sk->sk_reuse=1; /* SO_REUSEADDR */
- sock->sk->sk_reuse=1; /* SO_REUSEADDR */
+ msock->sk->sk_reuse = 1; /* SO_REUSEADDR */
+ sock->sk->sk_reuse = 1; /* SO_REUSEADDR */
sock->sk->sk_allocation = GFP_NOIO;
msock->sk->sk_allocation = GFP_NOIO;
- sock->sk->sk_priority=TC_PRIO_BULK;
+ sock->sk->sk_priority = TC_PRIO_BULK;
// FIXME fold to limits. should be done in drbd_ioctl
sock->sk->sk_sndbuf = mdev->net_conf->sndbuf_size;
sock->sk->sk_rcvbuf = mdev->net_conf->sndbuf_size;
@@ -802,7 +802,7 @@
sock->sk->sk_rcvtimeo = 2*HZ;
sock->sk->sk_userlocks |= SOCK_SNDBUF_LOCK | SOCK_RCVBUF_LOCK;
- msock->sk->sk_priority=TC_PRIO_INTERACTIVE;
+ msock->sk->sk_priority = TC_PRIO_INTERACTIVE;
msock->sk->sk_sndbuf = 2*32767;
msock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
msock->sk->sk_rcvtimeo = mdev->net_conf->ping_int*HZ;
@@ -828,7 +828,7 @@
sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
atomic_set(&mdev->packet_seq, 0);
- mdev->peer_seq=0;
+ mdev->peer_seq = 0;
drbd_thread_start(&mdev->asender);
@@ -944,12 +944,12 @@
drbd_drain_block(drbd_dev *mdev, int data_size)
{
struct page *page;
- int rr, rv=1;
+ int rr, rv = 1;
void* data;
page = drbd_pp_alloc(mdev, GFP_KERNEL);
- data=kmap(page);
+ data = kmap(page);
while(data_size) {
rr = drbd_recv(mdev, data, min_t(int, data_size, PAGE_SIZE));
if ( rr != min_t(int, data_size, PAGE_SIZE) ) {
@@ -990,7 +990,7 @@
bio_for_each_segment(bvec, bio, i) {
expect = min_t(int, data_size, bvec->bv_len);
- rr=drbd_recv(mdev,
+ rr = drbd_recv(mdev,
kmap(bvec->bv_page)+bvec->bv_offset,
expect);
kunmap(bvec->bv_page);
@@ -1164,7 +1164,7 @@
struct Tl_epoch_entry *e = (struct Tl_epoch_entry*)w;
sector_t sector = e->sector;
// unsigned int epoch_size;
- int ok=1, pcmd;
+ int ok = 1, pcmd;
if (mdev->net_conf->wire_protocol == DRBD_PROT_C) {
if (likely(drbd_bio_uptodate(e->private_bio))) {
@@ -1209,7 +1209,7 @@
STATIC int e_send_discard_ack(drbd_dev *mdev, struct drbd_work *w, int unused)
{
struct Tl_epoch_entry *e = (struct Tl_epoch_entry*)w;
- int ok=1;
+ int ok = 1;
D_ASSERT(mdev->net_conf->wire_protocol == DRBD_PROT_C);
ok = drbd_send_ack(mdev, DiscardAck, e);
@@ -1658,7 +1658,7 @@
STATIC int drbd_asb_recover_0p(drbd_dev *mdev)
{
- int self, peer, rv=-100;
+ int self, peer, rv = -100;
unsigned long ch_self, ch_peer;
self = mdev->bc->md.uuid[Bitmap] & 1;
@@ -1687,7 +1687,7 @@
"Using discard-least-changes instead\n");
case DiscardZeroChg:
if (ch_peer == 0 && ch_self == 0) {
- rv=test_bit(DISCARD_CONCURRENT, &mdev->flags) ? -1 : 1;
+ rv = test_bit(DISCARD_CONCURRENT, &mdev->flags) ? -1 : 1;
break;
} else {
if (ch_peer == 0) { rv = 1; break; }
@@ -1699,7 +1699,7 @@
else if (ch_self > ch_peer) rv = 1;
else /* ( ch_self == ch_peer ) */ {
// Well, then use something else.
- rv=test_bit(DISCARD_CONCURRENT, &mdev->flags) ? -1 : 1;
+ rv = test_bit(DISCARD_CONCURRENT, &mdev->flags) ? -1 : 1;
}
break;
case DiscardLocal:
@@ -1714,7 +1714,7 @@
STATIC int drbd_asb_recover_1p(drbd_dev *mdev)
{
- int self, peer, hg, rv=-100;
+ int self, peer, hg, rv = -100;
self = mdev->bc->md.uuid[Bitmap] & 1;
peer = mdev->p_uuid[Bitmap] & 1;
@@ -1731,8 +1731,8 @@
break;
case Consensus:
hg = drbd_asb_recover_0p(mdev);
- if (hg == -1 && mdev->state.role==Secondary) rv=hg;
- if (hg == 1 && mdev->state.role==Primary) rv=hg;
+ if (hg == -1 && mdev->state.role == Secondary) rv = hg;
+ if (hg == 1 && mdev->state.role == Primary) rv = hg;
break;
case Violently:
rv = drbd_asb_recover_0p(mdev);
@@ -1757,7 +1757,7 @@
STATIC int drbd_asb_recover_2p(drbd_dev *mdev)
{
- int self, peer, hg, rv=-100;
+ int self, peer, hg, rv = -100;
self = mdev->bc->md.uuid[Bitmap] & 1;
peer = mdev->p_uuid[Bitmap] & 1;
@@ -1860,7 +1860,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;
}
@@ -1871,7 +1871,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;
}
@@ -1882,9 +1882,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;
}
@@ -1925,7 +1925,7 @@
(peer_disk==Inconsistent && mydisk>Inconsistent) ) {
int f = (hg == -100) || abs(hg) == 2;
hg = mydisk > Inconsistent ? 1 : -1;
- if (f) hg=hg*2;
+ if (f) hg = hg*2;
INFO("Becoming sync %s due to disk states.\n",
hg > 0 ? "source" : "target");
}
@@ -1953,7 +1953,7 @@
" UUIDs where ambiguous.\n");
drbd_uuid_dump(mdev, "self", mdev->bc->md.uuid);
drbd_uuid_dump(mdev, "peer", mdev->p_uuid);
- hg=hg*2;
+ hg = hg*2;
}
}
}
@@ -2150,8 +2150,8 @@
if (drbd_recv(mdev, h->payload, h->length) != h->length)
return FALSE;
- p_size=be64_to_cpu(p->d_size);
- p_usize=be64_to_cpu(p->u_size);
+ p_size = be64_to_cpu(p->d_size);
+ p_usize = be64_to_cpu(p->u_size);
if (p_size == 0 && mdev->state.disk == Diskless) {
ERR("some backing storage is needed\n");
@@ -2169,7 +2169,7 @@
if (mdev->state.conn == WFReportParams) {
/* this is first connect, or an otherwise expected
param exchange. choose the minimum */
- p_usize=min_not_zero((sector_t)mdev->bc->dc.disk_size,
+ p_usize = min_not_zero((sector_t)mdev->bc->dc.disk_size,
p_usize);
}
@@ -2195,7 +2195,7 @@
}
#undef min_not_zero
- mdev->p_size=p_size;
+ mdev->p_size = p_size;
if (inc_local(mdev)) {
drbd_bm_lock(mdev); // {
/*
@@ -2213,7 +2213,7 @@
}
if (mdev->p_uuid && mdev->state.conn <= Connected && inc_local(mdev)) {
- nconn=drbd_sync_handshake(mdev, mdev->state.peer, mdev->state.pdsk);
+ nconn = drbd_sync_handshake(mdev, mdev->state.peer, mdev->state.pdsk);
dec_local(mdev);
if (nconn == conn_mask) return FALSE;
@@ -2349,7 +2349,7 @@
if (mdev->p_uuid && oconn <= Connected &&
peer_state.disk >= Negotiating &&
inc_local_if_state(mdev, Negotiating) ) {
- nconn=drbd_sync_handshake(mdev, peer_state.role, peer_state.disk);
+ nconn = drbd_sync_handshake(mdev, peer_state.role, peer_state.disk);
dec_local(mdev);
if (nconn == conn_mask) return FALSE;
@@ -2433,7 +2433,7 @@
{
size_t bm_words, bm_i, want, num_words;
unsigned long *buffer;
- int ok=FALSE;
+ int ok = FALSE;
drbd_bm_lock(mdev); // {
@@ -2469,7 +2469,7 @@
conns_to_name(mdev->state.conn));
}
- ok=TRUE;
+ ok = TRUE;
out:
drbd_bm_unlock(mdev); // }
vfree(buffer);
@@ -2578,7 +2578,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);
@@ -2601,7 +2601,7 @@
struct drbd_work prev_work_done;
enum fencing_policy fp;
drbd_state_t os, ns;
- int rv=SS_UnknownError;
+ int rv = SS_UnknownError;
D_ASSERT(mdev->state.conn < Connected);
/* FIXME verify that:
@@ -2646,8 +2646,8 @@
the disk-IO, while the rs_pending_cnt only tracks the blocks
on the fly. */
drbd_rs_cancel_all(mdev);
- mdev->rs_total=0;
- mdev->rs_failed=0;
+ mdev->rs_total = 0;
+ mdev->rs_failed = 0;
atomic_set(&mdev->rs_pending_cnt, 0);
wake_up(&mdev->misc_wait);
@@ -2692,7 +2692,7 @@
// Do not restart in case we are Disconnecting
ns = os;
ns.conn = Unconnected;
- rv=_drbd_set_state(mdev, ns, ChgStateVerbose);
+ rv = _drbd_set_state(mdev, ns, ChgStateVerbose);
}
spin_unlock_irq(&mdev->req_lock);
if (rv == SS_Success) {
@@ -2717,7 +2717,7 @@
mdev->cram_hmac_tfm = NULL;
}
kfree(mdev->net_conf);
- mdev->net_conf=NULL;
+ mdev->net_conf = NULL;
drbd_request_state(mdev, NS(conn, StandAlone));
}
@@ -2875,8 +2875,8 @@
struct hash_desc desc;
int rv;
- desc.tfm=mdev->cram_hmac_tfm;
- desc.flags=0;
+ desc.tfm = mdev->cram_hmac_tfm;
+ desc.flags = 0;
rv = crypto_hash_setkey(mdev->cram_hmac_tfm,
(u8*)mdev->net_conf->shared_secret, key_len);
@@ -3242,17 +3242,17 @@
int empty;
static struct asender_cmd asender_tbl[] = {
- [Ping] ={ sizeof(Drbd_Header), got_Ping },
- [PingAck] ={ sizeof(Drbd_Header), got_PingAck },
- [RecvAck] ={ sizeof(Drbd_BlockAck_Packet), got_BlockAck },
- [WriteAck] ={ sizeof(Drbd_BlockAck_Packet), got_BlockAck },
- [RSWriteAck]={ sizeof(Drbd_BlockAck_Packet), got_BlockAck },
- [DiscardAck]={ sizeof(Drbd_BlockAck_Packet), got_BlockAck },
- [NegAck] ={ sizeof(Drbd_BlockAck_Packet), got_NegAck },
- [NegDReply] ={ sizeof(Drbd_BlockAck_Packet), got_NegDReply },
- [NegRSDReply]={sizeof(Drbd_BlockAck_Packet), got_NegRSDReply},
- [BarrierAck]={ sizeof(Drbd_BarrierAck_Packet), got_BarrierAck },
- [StateChgReply]={sizeof(Drbd_RqS_Reply_Packet), got_RqSReply },
+ [Ping] = { sizeof(Drbd_Header), got_Ping },
+ [PingAck] = { sizeof(Drbd_Header), got_PingAck },
+ [RecvAck] = { sizeof(Drbd_BlockAck_Packet), got_BlockAck },
+ [WriteAck] = { sizeof(Drbd_BlockAck_Packet), got_BlockAck },
+ [RSWriteAck] = { sizeof(Drbd_BlockAck_Packet), got_BlockAck },
+ [DiscardAck] = { sizeof(Drbd_BlockAck_Packet), got_BlockAck },
+ [NegAck] = { sizeof(Drbd_BlockAck_Packet), got_NegAck },
+ [NegDReply] = { sizeof(Drbd_BlockAck_Packet), got_NegDReply },
+ [NegRSDReply] = { sizeof(Drbd_BlockAck_Packet), got_NegRSDReply},
+ [BarrierAck] = { sizeof(Drbd_BarrierAck_Packet), got_BarrierAck },
+ [StateChgReply] = { sizeof(Drbd_RqS_Reply_Packet), got_RqSReply },
};
sprintf(current->comm, "drbd%d_asender", mdev_to_minor(mdev));
Modified: branches/drbd-8.0-for-linus/drbd/drbd_worker.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_worker.c 2007-07-24 11:44:06 UTC (rev 2987)
+++ branches/drbd-8.0-for-linus/drbd/drbd_worker.c 2007-07-24 11:50:16 UTC (rev 2988)
@@ -77,8 +77,8 @@
*/
int drbd_endio_read_sec(struct bio *bio, unsigned int bytes_done, int error)
{
- unsigned long flags=0;
- struct Tl_epoch_entry *e=NULL;
+ unsigned long flags = 0;
+ struct Tl_epoch_entry *e = NULL;
struct Drbd_Conf* mdev;
int uptodate = bio_flagged(bio, BIO_UPTODATE);
@@ -121,8 +121,8 @@
*/
int drbd_endio_write_sec(struct bio *bio, unsigned int bytes_done, int error)
{
- unsigned long flags=0;
- struct Tl_epoch_entry *e=NULL;
+ unsigned long flags = 0;
+ struct Tl_epoch_entry *e = NULL;
drbd_dev *mdev;
sector_t e_sector;
int do_wake;
@@ -195,7 +195,7 @@
int drbd_endio_pri(struct bio *bio, unsigned int bytes_done, int error)
{
unsigned long flags;
- drbd_request_t *req=bio->bi_private;
+ drbd_request_t *req = bio->bi_private;
drbd_dev *mdev = req->mdev;
drbd_req_event_t what;
int uptodate = bio_flagged(bio, BIO_UPTODATE);
@@ -286,10 +286,10 @@
spin_lock_irqsave(&mdev->req_lock, flags);
if (likely(!test_and_clear_bit(STOP_SYNC_TIMER, &mdev->flags))) {
- queue=1;
+ queue = 1;
mdev->resync_work.cb = w_make_resync_request;
} else {
- queue=0;
+ queue = 0;
mdev->resync_work.cb = w_resync_inactive;
}
@@ -342,7 +342,7 @@
return 1;
}
- for(i=0;i<number;i++) {
+ for(i = 0;i<number;i++) {
next_sector:
size = BM_BLOCK_SIZE;
@@ -384,7 +384,7 @@
* "indirect" devices, this is dead code, since
* q->max_segment_size will be PAGE_SIZE.
*/
- align=1;
+ align = 1;
for (;;) {
if (size + BM_BLOCK_SIZE > max_segment_size)
break;
@@ -483,7 +483,7 @@
}
dt = (jiffies - mdev->rs_start - mdev->rs_paused) / HZ;
- if (dt <= 0) dt=1;
+ if (dt <= 0) dt = 1;
db = mdev->rs_total;
dbdt = Bit2KB(db/dt);
mdev->rs_paused /= HZ;
@@ -510,7 +510,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]);
@@ -526,8 +526,8 @@
// Now the two UUID sets are equal, update what we
// know of the peer.
int i;
- for ( i=Current ; i<=History_end ; i++ ) {
- mdev->p_uuid[i]=mdev->bc->md.uuid[i];
+ for ( i = Current ; i<=History_end ; i++ ) {
+ mdev->p_uuid[i] = mdev->bc->md.uuid[i];
}
}
}
@@ -567,13 +567,13 @@
}
if (likely(drbd_bio_uptodate(e->private_bio))) {
- ok=drbd_send_block(mdev, DataReply, e);
+ ok = drbd_send_block(mdev, DataReply, e);
} else {
if (DRBD_ratelimit(5*HZ, 5))
ERR("Sending NegDReply. sector=%llus.\n",
(unsigned long long)e->sector);
- ok=drbd_send_ack(mdev, NegDReply, e);
+ ok = drbd_send_ack(mdev, NegDReply, e);
/* FIXME we should not detach for read io-errors, in particular
* not now: when the peer asked us for our data, we are likely
@@ -618,18 +618,18 @@
if (likely(drbd_bio_uptodate(e->private_bio))) {
if (likely( mdev->state.pdsk >= Inconsistent )) {
inc_rs_pending(mdev);
- ok=drbd_send_block(mdev, RSDataReply, e);
+ ok = drbd_send_block(mdev, RSDataReply, e);
} else {
if (DRBD_ratelimit(5*HZ, 5))
ERR("Not sending RSDataReply, partner DISKLESS!\n");
- ok=1;
+ ok = 1;
}
} else {
if (DRBD_ratelimit(5*HZ, 5))
ERR("Sending NegRSDReply. sector %llus.\n",
(unsigned long long)e->sector);
- ok=drbd_send_ack(mdev, NegRSDReply, e);
+ ok = drbd_send_ack(mdev, NegRSDReply, e);
drbd_io_error(mdev, FALSE);
@@ -663,7 +663,7 @@
{
struct drbd_barrier *b = (struct drbd_barrier *)w;
Drbd_Barrier_Packet *p = &mdev->data.sbuf.Barrier;
- int ok=1;
+ int ok = 1;
/* really avoid racing with tl_clear. w.cb may have been referenced
* just before it was reassigned and requeued, so double check that.
@@ -751,7 +751,7 @@
int i;
local_irq_disable();
- for (i=0; i < minor_count; i++) {
+ for (i = 0; i < minor_count; i++) {
if (!(mdev = minor_to_mdev(i))) continue;
spin_lock(&mdev->req_lock);
}
@@ -762,7 +762,7 @@
drbd_dev *mdev;
int i;
- for (i=0; i < minor_count; i++) {
+ for (i = 0; i < minor_count; i++) {
if (!(mdev = minor_to_mdev(i))) continue;
spin_unlock(&mdev->req_lock);
}
@@ -795,7 +795,7 @@
drbd_dev *odev;
int i, rv = 0;
- for (i=0; i < minor_count; i++) {
+ for (i = 0; i < minor_count; i++) {
if ( !(odev = minor_to_mdev(i)) ) continue;
if (! _drbd_may_sync_now(odev)) {
rv |= ( _drbd_set_state(_NS(odev, aftr_isp, 1),
@@ -818,7 +818,7 @@
drbd_dev *odev;
int i, rv = 0;
- for (i=0; i < minor_count; i++) {
+ for (i = 0; i < minor_count; i++) {
if ( !(odev = minor_to_mdev(i)) ) continue;
if (odev->state.aftr_isp) {
if (_drbd_may_sync_now(odev)) {
@@ -871,7 +871,7 @@
void drbd_start_resync(drbd_dev *mdev, drbd_conns_t side)
{
drbd_state_t os, ns;
- int r=0;
+ int r = 0;
MTRACE(TraceTypeResync, TraceLvlSummary,
INFO("Resync starting: side=%s\n",
@@ -949,7 +949,7 @@
drbd_dev *mdev = thi->mdev;
struct drbd_work *w = 0;
LIST_HEAD(work_list);
- int intr=0, i;
+ int intr = 0, i;
sprintf(current->comm, "drbd%d_worker", mdev_to_minor(mdev));
Modified: branches/drbd-8.0-for-linus/drbd/linux/drbd.h
===================================================================
--- branches/drbd-8.0-for-linus/drbd/linux/drbd.h 2007-07-24 11:44:06 UTC (rev 2987)
+++ branches/drbd-8.0-for-linus/drbd/linux/drbd.h 2007-07-24 11:50:16 UTC (rev 2988)
@@ -72,7 +72,7 @@
/* KEEP the order, do not delete or insert!
* Or change the API_VERSION, too. */
enum ret_codes {
- RetCodeBase=100,
+ RetCodeBase = 100,
NoError, // 101 ...
LAAlreadyInUse,
OAAlreadyInUse,
@@ -122,10 +122,10 @@
#define DRBD_PROT_C 3
typedef enum {
- Unknown=0,
- Primary=1, // role
- Secondary=2, // role
- role_mask=3,
+ Unknown = 0,
+ Primary = 1, // role
+ Secondary = 2, // role
+ role_mask = 3,
} drbd_role_t;
/* The order of these constants is important.
@@ -158,7 +158,7 @@
SyncTarget, // state must be the same for source and target. (+2)
PausedSyncS, // All SyncStates are tested with this comparison
PausedSyncT, // xx >= SyncSource && xx <= PausedSyncT
- conn_mask=31
+ conn_mask = 31
} drbd_conns_t;
typedef enum {
@@ -172,7 +172,7 @@
DUnknown, /* Only used for the peer, never for myself */
Consistent, /* Might be Outdated, might be UpToDate ... */
UpToDate, /* Only this disk state allows applications' IO ! */
- disk_mask=15
+ disk_mask = 15
} drbd_disks_t;
typedef union {
@@ -192,22 +192,22 @@
} drbd_state_t;
typedef enum {
- SS_CW_NoNeed=4,
- SS_CW_Success=3,
- SS_NothingToDo=2,
- SS_Success=1,
- SS_UnknownError=0, // Used to sleep longer in _drbd_request_state
- SS_TwoPrimaries=-1,
- SS_NoUpToDateDisk=-2,
- SS_BothInconsistent=-4,
- SS_SyncingDiskless=-5,
- SS_ConnectedOutdates=-6,
- SS_PrimaryNOP=-7,
- SS_ResyncRunning=-8,
- SS_AlreadyStandAlone=-9,
- SS_CW_FailedByPeer=-10,
- SS_IsDiskLess=-11,
- SS_DeviceInUse=-12
+ SS_CW_NoNeed = 4,
+ SS_CW_Success = 3,
+ SS_NothingToDo = 2,
+ SS_Success = 1,
+ SS_UnknownError = 0, // Used to sleep longer in _drbd_request_state
+ SS_TwoPrimaries = -1,
+ SS_NoUpToDateDisk = -2,
+ SS_BothInconsistent = -4,
+ SS_SyncingDiskless = -5,
+ SS_ConnectedOutdates = -6,
+ SS_PrimaryNOP = -7,
+ SS_ResyncRunning = -8,
+ SS_AlreadyStandAlone = -9,
+ SS_CW_FailedByPeer = -10,
+ SS_IsDiskLess = -11,
+ SS_DeviceInUse = -12
} set_st_err_t;
/* from drbd_strings.c */
Modified: branches/drbd-8.0-for-linus/drbd/lru_cache.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/lru_cache.c 2007-07-24 11:44:06 UTC (rev 2987)
+++ branches/drbd-8.0-for-linus/drbd/lru_cache.c 2007-07-24 11:50:16 UTC (rev 2988)
@@ -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);
@@ -132,8 +132,8 @@
if (list_empty(&lc->lru)) return 0;
- n=lc->lru.prev;
- e=list_entry(n, struct lc_element, list);
+ n = lc->lru.prev;
+ e = list_entry(n, struct lc_element, list);
list_del(&e->list);
hlist_del(&e->colision);
@@ -166,7 +166,7 @@
if (list_empty(&lc->free)) return lc_evict(lc);
- n=lc->free.next;
+ n = lc->free.next;
list_del(n);
return list_entry(n, struct lc_element, list);
}
@@ -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