X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Fmd%2Fmd.c;h=3742ce8b0acf6b70cf119bc412654c94ec0aa165;hb=7da64a0abc3b2c6cbd3521672e9bb74dd560bb89;hp=9a880239219db5f1e08f2f176ffa0605f0ff22e5;hpb=aeb9b211849621f592288ed5ad694de9eeaae87a;p=deliverable%2Flinux.git

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 9a880239219d..3742ce8b0acf 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -848,7 +848,7 @@ void md_super_write(mddev_t *mddev, mdk_rdev_t *rdev,
 	bio->bi_end_io = super_written;
 
 	atomic_inc(&mddev->pending_writes);
-	submit_bio(REQ_WRITE | REQ_SYNC | REQ_FLUSH | REQ_FUA, bio);
+	submit_bio(WRITE_FLUSH_FUA, bio);
 }
 
 void md_super_wait(mddev_t *mddev)
@@ -2592,7 +2592,7 @@ state_store(mdk_rdev_t *rdev, const char *buf, size_t len)
 		err = 0;
 	} else if (cmd_match(buf, "-blocked")) {
 		if (!test_bit(Faulty, &rdev->flags) &&
-		    test_bit(BlockedBadBlocks, &rdev->flags)) {
+		    rdev->badblocks.unacked_exist) {
 			/* metadata handler doesn't understand badblocks,
 			 * so we need to fail the device
 			 */