[DRBD-cvs] svn commit by lars - r2987 - branches/drbd-8.0-for-linus/drbd - 240537acb9fb644deb8bf9a2374f9f2096035640 fix else shoul

[drbd-cvs at lists.linbit.com]

Author: lars
Date: 2007-07-24 13:44:06 +0200 (Tue, 24 Jul 2007)
New Revision: 2987

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_main.c
   branches/drbd-8.0-for-linus/drbd/drbd_receiver.c
Log:
240537acb9fb644deb8bf9a2374f9f2096035640 fix else should follow closing brace


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:39:45 UTC (rev 2986)
+++ branches/drbd-8.0-for-linus/drbd/drbd_actlog.c	2007-07-24 11:44:06 UTC (rev 2987)
@@ -54,8 +54,7 @@
 	if (FAULT_ACTIVE(mdev, (rw & WRITE)? DRBD_FAULT_MD_WR:DRBD_FAULT_MD_RD)) {
 		bio->bi_rw |= rw;
 		bio_endio(bio, bio->bi_size, -EIO);
-	}
-	else {
+	} else {
 #ifdef BIO_RW_SYNC
 		submit_bio(rw | (1 << BIO_RW_SYNC), bio);
 #else

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:39:45 UTC (rev 2986)
+++ branches/drbd-8.0-for-linus/drbd/drbd_bitmap.c	2007-07-24 11:44:06 UTC (rev 2987)
@@ -682,9 +682,9 @@
 	if (FAULT_ACTIVE(mdev, (rw&WRITE)?DRBD_FAULT_MD_WR:DRBD_FAULT_MD_RD)) {
 		bio->bi_rw |= rw;
 		bio_endio(bio, bio->bi_size, -EIO);
+	} else {
+		submit_bio(rw, bio);
 	}
-	else
-		submit_bio(rw, bio);
 }
 /* read one sector of the on disk bitmap into memory.
  * on disk bitmap is little endian.

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:39:45 UTC (rev 2986)
+++ branches/drbd-8.0-for-linus/drbd/drbd_main.c	2007-07-24 11:44:06 UTC (rev 2987)
@@ -1421,8 +1421,7 @@
 			 * but otherwise process as per normal - need to tell other
 			 * side that a full resync is required! */
 			ERR("Failed to write bitmap to disk!\n");
-		}
-		else {
+		} else {
 			drbd_md_clear_flag(mdev, MDF_FullSync);
 			drbd_md_sync(mdev);
 		}
@@ -2948,8 +2947,7 @@
 		// This results in nicely formatted output with addresses being on
 		// line size (16) byte boundaries
 		pstart = (const unsigned char *)((long)buffer & ~(LINE_SIZE-1));
-	}
-	else {
+	} else {
 		pstart = (const unsigned char *)buffer;
 	}
 
@@ -2972,8 +2970,7 @@
 			pbytes += sprintf(pbytes, "%*c ", field_width, ' ');
 			pascii += sprintf(pascii, "%*c", size, ' ');
 			p += size;
-		}
-		else {
+		} else {
 			// Add hex and ascii to strings
 			int val;
 			switch (size) {

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:39:45 UTC (rev 2986)
+++ branches/drbd-8.0-for-linus/drbd/drbd_receiver.c	2007-07-24 11:44:06 UTC (rev 2987)
@@ -2380,8 +2380,7 @@
 			// we want resync, peer has not yet decided to sync...
 			drbd_send_uuids(mdev);
 			drbd_send_state(mdev);
-		}
-		else if (nconn == Connected && peer_state.disk == Negotiating) {
+		} else if (nconn == Connected && peer_state.disk == Negotiating) {
 			// peer is waiting for us to respond...
 			drbd_send_state(mdev);
 		}