lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swap_info: miscellaneous minor cleanups

Browse Source 
Move CONFIG_HIBERNATION's swapdev_block() into the main CONFIG_HIBERNATION
block, remove extraneous whitespace and return, fix typo in a comment.

Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Hugh Dickins
2009-12-14 17:58:43 -08:00
committed by Linus Torvalds
parent 9625a5f289
commit 73c34b6acc
1 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
mm/swapfile.c
View File

@@ -629,7 +629,6 @@ void swapcache_free(swp_entry_t entry, struct page *page)
} }
spin_unlock(&swap_lock); spin_unlock(&swap_lock);
} }
return;
} }
/* /*
@@ -782,6 +781,21 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p)
return -ENODEV; return -ENODEV;
} }
/*
* Get the (PAGE_SIZE) block corresponding to given offset on the swapdev
* corresponding to given index in swap_info (swap type).
*/
sector_t swapdev_block(int type, pgoff_t offset)
{
struct block_device *bdev;
if ((unsigned int)type >= nr_swapfiles)
return 0;
if (!(swap_info[type]->flags & SWP_WRITEOK))
return 0;
return map_swap_page(swp_entry(type, offset), &bdev);
}
/* /*
* Return either the total number of swap pages of given type, or the number * Return either the total number of swap pages of given type, or the number
* of free pages of that type (depending on @free) * of free pages of that type (depending on @free)
@@ -805,7 +819,7 @@ unsigned int count_swap_pages(int type, int free)
spin_unlock(&swap_lock); spin_unlock(&swap_lock);
return n; return n;
} }
#endif #endif /* CONFIG_HIBERNATION */
/* /*
* No need to decide whether this PTE shares the swap entry with others, * No need to decide whether this PTE shares the swap entry with others,
@@ -1316,23 +1330,6 @@ sector_t map_swap_page(swp_entry_t entry, struct block_device **bdev)
} }
} }
#ifdef CONFIG_HIBERNATION
/*
* Get the (PAGE_SIZE) block corresponding to given offset on the swapdev
* corresponding to given index in swap_info (swap type).
*/
sector_t swapdev_block(int type, pgoff_t offset)
{
struct block_device *bdev;
if ((unsigned int)type >= nr_swapfiles)
return 0;
if (!(swap_info[type]->flags & SWP_WRITEOK))
return 0;
return map_swap_page(swp_entry(type, offset), &bdev);
}
#endif /* CONFIG_HIBERNATION */
/* /*
* Free all of a swapdev's extent information * Free all of a swapdev's extent information
*/ */
@@ -2185,7 +2182,7 @@ void swap_duplicate(swp_entry_t entry)
/* /*
* @entry: swap entry for which we allocate swap cache. * @entry: swap entry for which we allocate swap cache.
* *
* Called when allocating swap cache for exising swap entry, * Called when allocating swap cache for existing swap entry,
* This can return error codes. Returns 0 at success. * This can return error codes. Returns 0 at success.
* -EBUSY means there is a swap cache. * -EBUSY means there is a swap cache.
* Note: return code is different from swap_duplicate(). * Note: return code is different from swap_duplicate().