[DRBD-cvs] svn commit by lars - r2997 - branches/drbd-8.0-for-linus/drbd - 2a1752739664f9dee865ad696cd87e0d26d19486 got rid of vol

drbd-cvs at lists.linbit.com drbd-cvs at lists.linbit.com
Tue Jul 24 16:19:09 CEST 2007


Author: lars
Date: 2007-07-24 16:19:07 +0200 (Tue, 24 Jul 2007)
New Revision: 2997

Modified:
   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
Log:
2a1752739664f9dee865ad696cd87e0d26d19486 got rid of volatile; got rid of extern in .c file


Modified: branches/drbd-8.0-for-linus/drbd/drbd_int.h
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_int.h	2007-07-24 14:15:33 UTC (rev 2996)
+++ branches/drbd-8.0-for-linus/drbd/drbd_int.h	2007-07-24 14:19:07 UTC (rev 2997)
@@ -582,7 +582,7 @@
 	 *	--lge */
 
 	smp_rmb();
-	return (volatile int)thi->t_state;
+	return thi->t_state;
 }
 
 
@@ -782,8 +782,8 @@
 
 	struct drbd_socket data; /* data/barrier/cstate/parameter packets */
 	struct drbd_socket meta; /* ping/ack (metadata) packets */
-	volatile unsigned long last_received; /* in jiffies, either socket */
-	volatile unsigned int ko_count;
+	unsigned long last_received; /* in jiffies, either socket */
+	unsigned int ko_count;
 	struct drbd_work  resync_work,
 			  unplug_work,
 			  md_sync_work;
@@ -929,6 +929,7 @@
 	ScheduleAfter	= 4,
 };
 
+extern void drbd_init_set_defaults(struct drbd_conf *mdev);
 extern int drbd_change_state(struct drbd_conf *mdev, enum chg_state_flags f,
 			     union drbd_state_t mask, union drbd_state_t val);
 extern void drbd_force_state(struct drbd_conf *, union drbd_state_t, union drbd_state_t);

Modified: branches/drbd-8.0-for-linus/drbd/drbd_main.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_main.c	2007-07-24 14:15:33 UTC (rev 2996)
+++ branches/drbd-8.0-for-linus/drbd/drbd_main.c	2007-07-24 14:19:07 UTC (rev 2997)
@@ -119,9 +119,6 @@
 
 module_param_string(usermode_helper, usermode_helper, sizeof(usermode_helper), 0644);
 
-/* global panic flag */
-volatile int drbd_did_panic = 0;
-
 /* in 2.6.x, our device mapping and config info contains our virtual gendisks
  * as member "struct gendisk *vdisk;"
  */
@@ -1521,7 +1518,7 @@
 	drop_it =   mdev->meta.socket == sock
 		|| !mdev->asender.task
 		|| get_t_state(&mdev->asender) != Running
-		|| (volatile int)mdev->state.conn < Connected;
+		|| mdev->state.conn < Connected;
 
 	if (drop_it)
 		return TRUE;

Modified: branches/drbd-8.0-for-linus/drbd/drbd_nl.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_nl.c	2007-07-24 14:15:33 UTC (rev 2996)
+++ branches/drbd-8.0-for-linus/drbd/drbd_nl.c	2007-07-24 14:19:07 UTC (rev 2997)
@@ -116,7 +116,6 @@
 	tags = (unsigned short *)((char *)tags + arg->member ## _len);
 #include "linux/drbd_nl.h"
 
-extern void drbd_init_set_defaults(struct drbd_conf *mdev);
 void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name);
 void drbd_nl_send_reply(struct cn_msg *, int);
 



More information about the drbd-cvs mailing list