linux 6.3 compat: needs REQ_PREFLUSH | REQ_OP_WRITE

youzhongyang · andrewc12 · commit faf608e60fb9 · 2023-04-01T02:58:51.000+08:00
Modify bio_set_flush() so if kernel version is >= 4.10, flags REQ_PREFLUSH and REQ_OP_WRITE are set together. Reviewed-by: Tony Hutter <hutter2@llnl.gov> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Youzhong Yang <yyang@mathworks.com> Closes openzfs#14695
diff --git a/include/os/linux/kernel/linux/blkdev_compat.h b/include/os/linux/kernel/linux/blkdev_compat.h
@@ -426,7 +426,7 @@ static inline void
 bio_set_flush(struct bio *bio)
 {
 #if defined(HAVE_REQ_PREFLUSH)	/* >= 4.10 */
-	bio_set_op_attrs(bio, 0, REQ_PREFLUSH);
+	bio_set_op_attrs(bio, 0, REQ_PREFLUSH | REQ_OP_WRITE);
 #elif defined(WRITE_FLUSH_FUA)	/* >= 2.6.37 and <= 4.9 */
 	bio_set_op_attrs(bio, 0, WRITE_FLUSH_FUA);
 #else

Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,7 @@ static inline void`
`426`	`426`	`bio_set_flush(struct bio *bio)`
`427`	`427`	`{`
`428`	`428`	`#if defined(HAVE_REQ_PREFLUSH) /* >= 4.10 */`
`429`		`- bio_set_op_attrs(bio, 0, REQ_PREFLUSH);`
	`429`	`+ bio_set_op_attrs(bio, 0, REQ_PREFLUSH \| REQ_OP_WRITE);`
`430`	`430`	`#elif defined(WRITE_FLUSH_FUA) /* >= 2.6.37 and <= 4.9 */`
`431`	`431`	`bio_set_op_attrs(bio, 0, WRITE_FLUSH_FUA);`
`432`	`432`	`#else`