leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: ramzswap: Remove redundant check for zero page

Browse Source 
ramzswap_free_page() already handles the case for zero filled
pages. So, remove redundant logic for the same in ramzswap_write().

Signed-off-by: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Nitin Gupta 2010-01-28 21:13:41 +05:30 committed by Greg Kroah-Hartman
parent de1a21a0f1
commit 2e88228174
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/ramzswap/ramzswap_drv.c
View File

@ -593,6 +593,10 @@ static void ramzswap_free_page(struct ramzswap *rzs, size_t index)
u32 offset = rzs->table[index].offset; u32 offset = rzs->table[index].offset;
if (unlikely(!page)) { if (unlikely(!page)) {
/*
* No memory is allocated for zero filled pages.
* Simply clear zero page flag.
*/
if (rzs_test_flag(rzs, index, RZS_ZERO)) { if (rzs_test_flag(rzs, index, RZS_ZERO)) {
rzs_clear_flag(rzs, index, RZS_ZERO); rzs_clear_flag(rzs, index, RZS_ZERO);
rzs_stat_dec(&rzs->stats.pages_zero); rzs_stat_dec(&rzs->stats.pages_zero);
@ -789,18 +793,9 @@ static int ramzswap_write(struct ramzswap *rzs, struct bio *bio)
* is no longer referenced by any process. So, its now safe * is no longer referenced by any process. So, its now safe
* to free the memory that was allocated for this page. * to free the memory that was allocated for this page.
*/ */
if (rzs->table[index].page) if (rzs->table[index].page || rzs_test_flag(rzs, index, RZS_ZERO))
ramzswap_free_page(rzs, index); ramzswap_free_page(rzs, index);
/*
* No memory is allocated for zero filled pages.
* Simply clear zero page flag.
*/
if (rzs_test_flag(rzs, index, RZS_ZERO)) {
rzs_stat_dec(&rzs->stats.pages_zero);
rzs_clear_flag(rzs, index, RZS_ZERO);
}
mutex_lock(&rzs->lock); mutex_lock(&rzs->lock);
user_mem = kmap_atomic(page, KM_USER0); user_mem = kmap_atomic(page, KM_USER0);