block: don't warn for flush on read-only device

axboe · axboe · commit b089cfd95d32 · 2018-08-14T10:52:40.000-06:00
Don't warn for a flush issued to a read-only device. It's not strictly a writable command, as it doesn't change any on-media data by itself. Reported-by: Stefan Agner <stefan@agner.ch> Fixes: 721c7fc ("block: fail op_is_write() requests to read-only partitions") Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/block/blk-core.c b/block/blk-core.c
@@ -2162,7 +2162,9 @@ static inline bool should_fail_request(struct hd_struct *part,
 
 static inline bool bio_check_ro(struct bio *bio, struct hd_struct *part)
 {
-	if (part->policy && op_is_write(bio_op(bio))) {
+	const int op = bio_op(bio);
+
+	if (part->policy && (op_is_write(op) && !op_is_flush(op))) {
 		char b[BDEVNAME_SIZE];
 
 		printk(KERN_ERR

Original file line number	Diff line number	Diff line change
`@@ -2162,7 +2162,9 @@ static inline bool should_fail_request(struct hd_struct *part,`
`2162`	`2162`
`2163`	`2163`	`static inline bool bio_check_ro(struct bio bio, struct hd_struct part)`
`2164`	`2164`	`{`
`2165`		`- if (part->policy && op_is_write(bio_op(bio))) {`
	`2165`	`+ const int op = bio_op(bio);`
	`2166`	`+`
	`2167`	`+ if (part->policy && (op_is_write(op) && !op_is_flush(op))) {`
`2166`	`2168`	`char b[BDEVNAME_SIZE];`
`2167`	`2169`
`2168`	`2170`	`printk(KERN_ERR`