xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] swsusp: use block device offsets to identify swap locations

Browse Source 
Make swsusp use block device offsets instead of swap offsets to identify swap
locations and make it use the same code paths for writing as well as for
reading data.

This allows us to use the same code for handling swap files and swap
partitions and to simplify the code, eg.  by dropping rw_swap_page_sync().

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Rafael J. Wysocki
2006-12-06 20:34:10 -08:00
committed by Linus Torvalds
parent 3fc6b34f48
commit 3aef83e0ef
7 changed files with 96 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/power/swsusp.c
View File

@@ -134,18 +134,18 @@ static int bitmap_set(struct bitmap_page *bitmap, unsigned long bit)
return 0;
}
unsigned long alloc_swap_page(int swap, struct bitmap_page *bitmap)
sector_t alloc_swapdev_block(int swap, struct bitmap_page *bitmap)
{
unsigned long offset;
offset = swp_offset(get_swap_page_of_type(swap));
if (offset) {
if (bitmap_set(bitmap, offset)) {
if (bitmap_set(bitmap, offset))
swap_free(swp_entry(swap, offset));
offset = 0;
}
else
return swapdev_block(swap, offset);
}
return offset;
return 0;
}
void free_all_swap_pages(int swap, struct bitmap_page *bitmap)