File tree Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -972,13 +972,7 @@ static void blk_account_io_merge_bio(struct request *req)
972
972
part_stat_unlock ();
973
973
}
974
974
975
- enum bio_merge_status {
976
- BIO_MERGE_OK ,
977
- BIO_MERGE_NONE ,
978
- BIO_MERGE_FAILED ,
979
- };
980
-
981
- static enum bio_merge_status bio_attempt_back_merge (struct request * req ,
975
+ enum bio_merge_status bio_attempt_back_merge (struct request * req ,
982
976
struct bio * bio , unsigned int nr_segs )
983
977
{
984
978
const blk_opf_t ff = bio_failfast (bio );
Original file line number Diff line number Diff line change @@ -269,6 +269,14 @@ static inline void bio_integrity_free(struct bio *bio)
269
269
unsigned long blk_rq_timeout (unsigned long timeout );
270
270
void blk_add_timer (struct request * req );
271
271
272
+ enum bio_merge_status {
273
+ BIO_MERGE_OK ,
274
+ BIO_MERGE_NONE ,
275
+ BIO_MERGE_FAILED ,
276
+ };
277
+
278
+ enum bio_merge_status bio_attempt_back_merge (struct request * req ,
279
+ struct bio * bio , unsigned int nr_segs );
272
280
bool blk_attempt_plug_merge (struct request_queue * q , struct bio * bio ,
273
281
unsigned int nr_segs );
274
282
bool blk_bio_list_merge (struct request_queue * q , struct list_head * list ,
You can’t perform that action at this time.
0 commit comments