X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=drivers%2Fmd%2Fraid5.c;h=866d4b5a144c465daf21e439b9b0e6ef36571d6a;hp=e30a809cbea0f2a4b7b13b20c6d1d483e63985f4;hb=90a9ed9581b896d867645b21f0133795e3942fe6;hpb=fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index e30a809cbea0..866d4b5a144c 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -3978,7 +3978,7 @@ static int make_request(mddev_t *mddev, struct bio * bi)
 	const int rw = bio_data_dir(bi);
 	int remaining;
 
-	if (unlikely(bio_rw_flagged(bi, BIO_RW_BARRIER))) {
+	if (unlikely(bi->bi_rw & REQ_HARDBARRIER)) {
 		/* Drain all pending writes.  We only really need
 		 * to ensure they have been submitted, but this is
 		 * easier.