suspend: simplify block I/O handling
Subsystems (4)
PATCH 1/1 suspend: simplify block I/O handling
Stop abusing struct page functionality and the swap end_io handler, and instead add a modified version of the blk-lib.c bio_batch helpers.
Also move the block I/O code into swap.c as they are directly tied into each other.
Signed-off-by Christoph Hellwig <[email protected]>
Tested-by Pavel Machek <[email protected]>
Tested-by Ming Lin <[email protected]>
Acked-by Pavel Machek <[email protected]>
--- include/linux/swap.h | 1 - kernel/power/Makefile | 3 +- kernel/power/block_io.c | 103 ------------------------------- kernel/power/power.h | 9 --- kernel/power/swap.c | 159 ++++++++++++++++++++++++++++++++++++------------ mm/page_io.c | 2 +- 6 files changed, 122 insertions(+), 155 deletions(-) delete mode 100644 kernel/power/block_io.c
include/linux/swap.h +0 -1
@@ -377,7 +377,6 @@ extern void end_swap_bio_write(struct bio *bio, int err);extern int __swap_writepage (struct page *page,struct writeback_control *wbc,void (*end_write_func)(struct bio *,int ));extern int swap_set_page_dirty (struct page *page); -extern void end_swap_bio_read (struct bio *bio,int err);int add_swap_extent (struct swap_info_struct *sis,unsigned long start_page,unsigned long nr_pages,sector_t start_block);
kernel/power/Makefile +1 -2
@@ -7,8 +7,7 @@ obj-$(CONFIG_VT_CONSOLE_SLEEP) += console.o obj-$(CONFIG_FREEZER) += process.o obj-$(CONFIG_SUSPEND) += suspend.o obj-$(CONFIG_PM_TEST_SUSPEND) += suspend_test.o -obj-$(CONFIG_HIBERNATION) += hibernate.o snapshot.o swap.o user.o \ - block_io.o +obj-$(CONFIG_HIBERNATION) += hibernate.o snapshot.o swap.o user.o obj-$(CONFIG_PM_AUTOSLEEP) += autosleep.o obj-$(CONFIG_PM_WAKELOCKS) += wakelock.o
kernel/power/block_io.c deleted +0 -103
103 lines not on this page · raw message
kernel/power/power.h +0 -9
@@ -163,15 +163,6 @@ extern void swsusp_close(fmode_t);extern int swsusp_unmark (void );#endif -/* kernel/power/block_io.c */ -extern struct block_device *hib_resume_bdev; - -extern int hib_bio_read_page (pgoff_t page_off,void *addr, -struct bio **bio_chain); -extern int hib_bio_write_page (pgoff_t page_off,void *addr, -struct bio **bio_chain); -extern int hib_wait_on_bio_chain (struct bio **bio_chain); -struct timeval ;/* kernel/power/swsusp.c */ extern void swsusp_show_speed (ktime_t ,ktime_t ,unsigned int ,char *);
kernel/power/swap.c +120 -39
391 lines not on this page · raw message
mm/page_io.c +1 -1
@@ -69,7 +69,7 @@ void end_swap_bio_write(struct bio *bio, int err)bio_put (bio); } -void end_swap_bio_read (struct bio *bio,int err) +static void end_swap_bio_read (struct bio *bio,int err) {const int uptodate =test_bit (BIO_UPTODATE , &bio->bi_flags);struct page *page = bio->bi_io_vec[0 ].bv_page;
Signature · 1 line
1.9.1
Quoted 5 lines · Christoph Hellwig
Stop abusing struct page functionality and the swap
end_iohandler, and instead add a modified version of theblk-lib.cbio_batchhelpers.Also move the block I/O code into
swap.cas they are directly tied into each other.
This is a vast improvement, applied for 4.2, thanks.
Signature · 1 line
Jens Axboe