---

yaml --- r: 346218 b: refs/heads/master c: bf709c8 h: refs/heads/master v: v3
git-mirror · Nov 8, 2012 · 0dbfa92 · 0dbfa92
1 parent 56c0332
commit 0dbfa92
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b9ef85e05f123f535d4ee1c5041b80f80648e50
+refs/heads/master: bf709c8552bcbbbc66ecc11555a781e814a037d8
diff --git a/trunk/drivers/block/drbd/drbd_int.h b/trunk/drivers/block/drbd/drbd_int.h
@@ -672,7 +672,6 @@ enum {
 
 /* flag bits per mdev */
 enum {
-	UNPLUG_QUEUED,		/* only relevant with kernel 2.4 */
 	UNPLUG_REMOTE,		/* sending a "UnplugRemote" could help */
 	MD_DIRTY,		/* current uuids and flags not yet on disk */
 	USE_DEGR_WFC_T,		/* degr-wfc-timeout instead of wfc-timeout. */
@@ -681,7 +680,6 @@ enum {
 	CRASHED_PRIMARY,	/* This node was a crashed primary.
 				 * Gets cleared when the state.conn
 				 * goes into C_CONNECTED state. */
-	NO_BARRIER_SUPP,	/* underlying block device doesn't implement barriers */
 	CONSIDER_RESYNC,
 
 	MD_NO_FUA,		/* Users wants us to not use FUA/FLUSH on meta data dev */