Commit 255373b8 authored by Andrew Morton's avatar Andrew Morton Committed by Dave Jones

[PATCH] remove SWAP_ERROR

From: Hugh Dickins <hugh@veritas.com>

Delete unused SWAP_ERROR and non-existent page_over_rsslimit().
parent 927ae7fc
...@@ -177,13 +177,11 @@ struct pte_chain *FASTCALL(page_add_rmap(struct page *, pte_t *, ...@@ -177,13 +177,11 @@ struct pte_chain *FASTCALL(page_add_rmap(struct page *, pte_t *,
struct pte_chain *)); struct pte_chain *));
void FASTCALL(page_remove_rmap(struct page *, pte_t *)); void FASTCALL(page_remove_rmap(struct page *, pte_t *));
int FASTCALL(try_to_unmap(struct page *)); int FASTCALL(try_to_unmap(struct page *));
int FASTCALL(page_over_rsslimit(struct page *));
/* return values of try_to_unmap */ /* return values of try_to_unmap */
#define SWAP_SUCCESS 0 #define SWAP_SUCCESS 0
#define SWAP_AGAIN 1 #define SWAP_AGAIN 1
#define SWAP_FAIL 2 #define SWAP_FAIL 2
#define SWAP_ERROR 3
/* linux/mm/shmem.c */ /* linux/mm/shmem.c */
extern int shmem_unuse(swp_entry_t entry, struct page *page); extern int shmem_unuse(swp_entry_t entry, struct page *page);
......
...@@ -415,7 +415,6 @@ static int try_to_unmap_one(struct page * page, pte_addr_t paddr) ...@@ -415,7 +415,6 @@ static int try_to_unmap_one(struct page * page, pte_addr_t paddr)
* SWAP_SUCCESS - we succeeded in removing all mappings * SWAP_SUCCESS - we succeeded in removing all mappings
* SWAP_AGAIN - we missed a trylock, try again later * SWAP_AGAIN - we missed a trylock, try again later
* SWAP_FAIL - the page is unswappable * SWAP_FAIL - the page is unswappable
* SWAP_ERROR - an error occurred
*/ */
int try_to_unmap(struct page * page) int try_to_unmap(struct page * page)
{ {
...@@ -483,9 +482,6 @@ int try_to_unmap(struct page * page) ...@@ -483,9 +482,6 @@ int try_to_unmap(struct page * page)
case SWAP_FAIL: case SWAP_FAIL:
ret = SWAP_FAIL; ret = SWAP_FAIL;
goto out; goto out;
case SWAP_ERROR:
ret = SWAP_ERROR;
goto out;
} }
} }
} }
......
...@@ -284,7 +284,6 @@ shrink_list(struct list_head *page_list, unsigned int gfp_mask, ...@@ -284,7 +284,6 @@ shrink_list(struct list_head *page_list, unsigned int gfp_mask,
*/ */
if (page_mapped(page) && mapping) { if (page_mapped(page) && mapping) {
switch (try_to_unmap(page)) { switch (try_to_unmap(page)) {
case SWAP_ERROR:
case SWAP_FAIL: case SWAP_FAIL:
pte_chain_unlock(page); pte_chain_unlock(page);
goto activate_locked; goto activate_locked;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment