A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

swap_info: private to swapfile.c

Browse source 
The swap_info_struct is mostly private to mm/swapfile.c, with only
one other in-tree user: get_swap_bio().  Adjust its interface to
map_swap_page(), so that we can then remove get_swap_info_struct().

But there is a popular user out-of-tree, TuxOnIce: so leave the
declaration of swap_info_struct in linux/swap.h.

Signed-off-by: Hugh Dickins <[email protected]>
Cc: Nigel Cunningham <[email protected]>
Cc: KAMEZAWA Hiroyuki <[email protected]>
Reviewed-by: Rik van Riel <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Hugh Dickins 2009-12-14 17:58:40 -08:00 • committed by Linus Torvalds
commit f29ad6a99b
3 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

29
mm/swapfile.c
View file

@ -1283,12 +1283,22 @@ static void drain_mmlist(void)
/*
* Use this swapdev's extent info to locate the (PAGE_SIZE) block which
* corresponds to page offset `offset'.
* corresponds to page offset `offset'. Note that the type of this function
* is sector_t, but it returns page offset into the bdev, not sector offset.
*/
sector_t map_swap_page(struct swap_info_struct *sis, pgoff_t offset)
sector_t map_swap_page(swp_entry_t entry, struct block_device **bdev)
{
struct swap_extent *se = sis->curr_swap_extent;
struct swap_extent *start_se = se;
struct swap_info_struct *sis;
struct swap_extent *start_se;
struct swap_extent *se;
pgoff_t offset;
sis = swap_info + swp_type(entry);
*bdev = sis->bdev;
offset = swp_offset(entry);
start_se = sis->curr_swap_extent;
se = start_se;
for ( ; ; ) {
struct list_head *lh;
@ -1314,12 +1324,14 @@ sector_t map_swap_page(struct swap_info_struct *sis, pgoff_t offset)
sector_t swapdev_block(int swap_type, pgoff_t offset)
{
struct swap_info_struct *sis;
struct block_device *bdev;
if (swap_type >= nr_swapfiles)
return 0;
sis = swap_info + swap_type;
return (sis->flags & SWP_WRITEOK) ? map_swap_page(sis, offset) : 0;
return (sis->flags & SWP_WRITEOK) ?
map_swap_page(swp_entry(swap_type, offset), &bdev) : 0;
}
#endif /* CONFIG_HIBERNATION */
@ -2159,13 +2171,6 @@ int swapcache_prepare(swp_entry_t entry)
return __swap_duplicate(entry, SWAP_CACHE);
}
struct swap_info_struct *
get_swap_info_struct(unsigned type)
{
return &swap_info[type];
}
/*
* swap_lock prevents swap_map being freed. Don't grab an extra
* reference on the swaphandle, it doesn't matter if it becomes unused.