Commit b131f20
blk-mq: rename blk_attempt_bio_merge
It is very annoying to have two block layer functions which share same
name, so rename blk_attempt_bio_merge in blk-mq.c as
blk_mq_attempt_bio_merge.
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211111085134.345235-3-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>1 parent 10f7335 commit b131f20
1 file changed
Lines changed: 6 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2495 | 2495 | | |
2496 | 2496 | | |
2497 | 2497 | | |
2498 | | - | |
2499 | | - | |
| 2498 | + | |
| 2499 | + | |
| 2500 | + | |
2500 | 2501 | | |
2501 | 2502 | | |
2502 | 2503 | | |
| |||
2524 | 2525 | | |
2525 | 2526 | | |
2526 | 2527 | | |
2527 | | - | |
| 2528 | + | |
2528 | 2529 | | |
2529 | 2530 | | |
2530 | 2531 | | |
| |||
2560 | 2561 | | |
2561 | 2562 | | |
2562 | 2563 | | |
2563 | | - | |
| 2564 | + | |
| 2565 | + | |
2564 | 2566 | | |
2565 | 2567 | | |
2566 | 2568 | | |
| |||
0 commit comments