[v2,16/19] md: raid1: use __bio_add_page for adding single page to bio

Commit Message

Johannes Thumshirn March 30, 2023, 10:43 a.m. UTC

The sync request code uses bio_add_page() to add a page to a newly created bio.
bio_add_page() can fail, but the return value is never checked.

Use __bio_add_page() as adding a single page to a newly created bio is
guaranteed to succeed.

This brings us a step closer to marking bio_add_page() as __must_check.

Signed-off-by: Johannes Thumshirn <[e-mail]>
Reviewed-by: Damien Le Moal <[e-mail]>
---
 drivers/md/raid1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Song Liu March 31, 2023, 5:59 p.m. UTC | #1

On Thu, Mar 30, 2023 at 3:44 AM Johannes Thumshirn
<[e-mail]> wrote:
>
> The sync request code uses bio_add_page() to add a page to a newly created bio.
> bio_add_page() can fail, but the return value is never checked.
>
> Use __bio_add_page() as adding a single page to a newly created bio is
> guaranteed to succeed.
>
> This brings us a step closer to marking bio_add_page() as __must_check.
>
> Signed-off-by: Johannes Thumshirn <[e-mail]>
> Reviewed-by: Damien Le Moal <[e-mail]>

Acked-by: Song Liu <[e-mail]>

Thanks!

Patch

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index bd7c339a84a1..c226d293992f 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -2915,7 +2915,7 @@  static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr,
 				 * won't fail because the vec table is big
 				 * enough to hold all these pages
 				 */
-				bio_add_page(bio, page, len, 0);
+				__bio_add_page(bio, page, len, 0);
 			}
 		}
 		nr_sectors += len>>9;