diff --git a/[refs] b/[refs] index f9d9a37e8fc2..0d389309ab74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9028b0ff2bad1954568604dc17725692c8524d6 +refs/heads/master: 9e71f9c848e669f003b1319da52f03cb8e7d7403 diff --git a/trunk/include/linux/raid/raid1.h b/trunk/include/linux/raid/raid1.h index 9d5494aaac0f..3009c813d83d 100644 --- a/trunk/include/linux/raid/raid1.h +++ b/trunk/include/linux/raid/raid1.h @@ -130,6 +130,6 @@ struct r1bio_s { * with failure when last write completes (and all failed). * Record that bi_end_io was called with this flag... */ -#define R1BIO_Returned 4 +#define R1BIO_Returned 6 #endif