Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / md / raid1.h

diff --git a/drivers/md/raid1.h b/drivers/md/raid1.h
index 5f2d443ae28af03cb31d6b16d30495abc73b45ff..cbfdf1a6acd98e6f501d29912c2bc718c39450df 100644 (file)
--- a/drivers/md/raid1.h
+++ b/drivers/md/raid1.h
@@ -35,8 +35,6 @@ struct r1_private_data_s {
        struct list_head        retry_list;
        /* queue pending writes and submit them on unplug */
        struct bio_list         pending_bio_list;
-       /* queue of writes that have been unplugged */
-       struct bio_list         flushing_bio_list;
 
        /* for use when syncing mirrors: */
 
@@ -117,8 +115,6 @@ struct r1bio_s {
 #define        R1BIO_IsSync    1
 #define        R1BIO_Degraded  2
 #define        R1BIO_BehindIO  3
-#define        R1BIO_Barrier   4
-#define R1BIO_BarrierRetry 5
 /* For write-behind requests, we call bi_end_io when
  * the last non-write-behind device completes, providing
  * any write was successful.  Otherwise we call when