From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH v2 01/19] swap: use __bio_add_page to add page to bio
Date: Thu, 30 Mar 2023 03:43:43 -0700 [thread overview]
Message-ID: <c7277072dac6d70883682f866a89348d4cd22d25.1680172791.git.johannes.thumshirn@wdc.com> (raw)
In-Reply-To: <cover.1680172791.git.johannes.thumshirn@wdc.com>
The swap code only adds a single page to a newly created bio. So use
__bio_add_page() to add the page which is guaranteed to succeed in this
case.
This brings us closer to marking bio_add_page() as __must_check.
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
mm/page_io.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mm/page_io.c b/mm/page_io.c
index 87b682d18850..684cd3c7b59b 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -338,7 +338,7 @@ static void swap_writepage_bdev_sync(struct page *page,
bio_init(&bio, sis->bdev, &bv, 1,
REQ_OP_WRITE | REQ_SWAP | wbc_to_write_flags(wbc));
bio.bi_iter.bi_sector = swap_page_sector(page);
- bio_add_page(&bio, page, thp_size(page), 0);
+ __bio_add_page(&bio, page, thp_size(page), 0);
bio_associate_blkg_from_page(&bio, page);
count_swpout_vm_event(page);
@@ -360,7 +360,7 @@ static void swap_writepage_bdev_async(struct page *page,
GFP_NOIO);
bio->bi_iter.bi_sector = swap_page_sector(page);
bio->bi_end_io = end_swap_bio_write;
- bio_add_page(bio, page, thp_size(page), 0);
+ __bio_add_page(bio, page, thp_size(page), 0);
bio_associate_blkg_from_page(bio, page);
count_swpout_vm_event(page);
@@ -468,7 +468,7 @@ static void swap_readpage_bdev_sync(struct page *page,
bio_init(&bio, sis->bdev, &bv, 1, REQ_OP_READ);
bio.bi_iter.bi_sector = swap_page_sector(page);
- bio_add_page(&bio, page, thp_size(page), 0);
+ __bio_add_page(&bio, page, thp_size(page), 0);
/*
* Keep this task valid during swap readpage because the oom killer may
* attempt to access it in the page fault retry time check.
@@ -488,7 +488,7 @@ static void swap_readpage_bdev_async(struct page *page,
bio = bio_alloc(sis->bdev, 1, REQ_OP_READ, GFP_KERNEL);
bio->bi_iter.bi_sector = swap_page_sector(page);
bio->bi_end_io = end_swap_bio_read;
- bio_add_page(bio, page, thp_size(page), 0);
+ __bio_add_page(bio, page, thp_size(page), 0);
count_vm_event(PSWPIN);
submit_bio(bio);
}
--
2.39.2
next prev parent reply other threads:[~2023-03-30 10:43 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-30 10:43 [Cluster-devel] [PATCH v2 00/19] bio: check return values of bio_add_page Johannes Thumshirn
2023-03-30 10:43 ` Johannes Thumshirn [this message]
2023-03-30 10:43 ` [Cluster-devel] [PATCH v2 02/19] drbd: use __bio_add_page to add page to bio Johannes Thumshirn
2023-03-30 10:43 ` [Cluster-devel] [PATCH v2 03/19] dm: dm-zoned: use __bio_add_page for adding single metadata page Johannes Thumshirn
2023-03-30 10:43 ` [Cluster-devel] [PATCH v2 04/19] fs: buffer: use __bio_add_page to add single page to bio Johannes Thumshirn
2023-03-30 10:43 ` [Cluster-devel] [PATCH v2 05/19] md: use __bio_add_page to add single page Johannes Thumshirn
2023-03-31 17:47 ` Song Liu
2023-03-30 10:43 ` [Cluster-devel] [PATCH v2 06/19] md: raid5-log: " Johannes Thumshirn
2023-03-31 17:47 ` Song Liu
2023-03-30 10:43 ` [Cluster-devel] [PATCH v2 07/19] md: raid5: use __bio_add_page to add single page to new bio Johannes Thumshirn
2023-03-31 17:47 ` Song Liu
2023-03-30 10:43 ` [Cluster-devel] [PATCH v2 08/19] btrfs: repair: use __bio_add_page for adding single page Johannes Thumshirn
2023-03-30 10:43 ` [Cluster-devel] [PATCH v2 09/19] btrfs: raid56: use __bio_add_page to add " Johannes Thumshirn
2023-03-30 10:43 ` [Cluster-devel] [PATCH v2 10/19] jfs: logmgr: use __bio_add_page to add single page to bio Johannes Thumshirn
2023-03-30 16:50 ` Dave Kleikamp
2023-03-30 10:43 ` [Cluster-devel] [PATCH v2 11/19] gfs: use __bio_add_page for adding " Johannes Thumshirn
2023-03-30 10:43 ` [Cluster-devel] [PATCH v2 12/19] zonefs: " Johannes Thumshirn
2023-03-30 10:43 ` [Cluster-devel] [PATCH v2 13/19] zram: " Johannes Thumshirn
2023-03-30 10:43 ` [Cluster-devel] [PATCH v2 14/19] floppy: " Johannes Thumshirn
2023-03-30 10:43 ` [Cluster-devel] [PATCH v2 15/19] md: check for failure when adding pages in alloc_behind_master_bio Johannes Thumshirn
2023-03-31 17:54 ` Song Liu
2023-03-30 10:43 ` [Cluster-devel] [PATCH v2 16/19] md: raid1: use __bio_add_page for adding single page to bio Johannes Thumshirn
2023-03-31 17:59 ` Song Liu
2023-03-30 10:43 ` [Cluster-devel] [PATCH v2 17/19] md: raid1: check if adding pages to resync bio fails Johannes Thumshirn
2023-03-31 18:13 ` Song Liu
2023-04-04 8:26 ` Johannes Thumshirn
2023-04-10 16:06 ` Song Liu
2023-03-30 10:44 ` [Cluster-devel] [PATCH v2 18/19] dm-crypt: check if adding pages to clone " Johannes Thumshirn
2023-03-30 10:44 ` [Cluster-devel] [PATCH v2 19/19] block: mark bio_add_page as __must_check Johannes Thumshirn
2023-03-30 15:45 ` [Cluster-devel] [PATCH v2 00/19] bio: check return values of bio_add_page David Sterba
2023-03-30 16:41 ` Johannes Thumshirn
2023-03-30 19:25 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c7277072dac6d70883682f866a89348d4cd22d25.1680172791.git.johannes.thumshirn@wdc.com \
--to=johannes.thumshirn@wdc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).