Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73c34b6a authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

swap_info: miscellaneous minor cleanups 



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: default avatarHugh Dickins <hugh.dickins@tiscali.co.uk>
Reviewed-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9625a5f2

mm/swapfile.c

+24 −27
Original line number Diff line number Diff line
@@ -629,7 +629,6 @@ void swapcache_free(swp_entry_t entry, struct page *page) 
		}

		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;

}



/*

 * 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

 * 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);

	return n;

}

#endif

#endif /* CONFIG_HIBERNATION */



/*

 * 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

 */
@@ -2185,7 +2182,7 @@ void swap_duplicate(swp_entry_t entry) 
/*

 * @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.

 * -EBUSY means there is a swap cache.

 * Note: return code is different from swap_duplicate().