Commit a82cbf07 authored by YiPing Xu's avatar YiPing Xu Committed by Linus Torvalds

zsmalloc: drop unused member 'mapping_area->huge'

When unmapping a huge class page in zs_unmap_object, the page will be
unmapped by kmap_atomic.  the "!area->huge" branch in __zs_unmap_object
is alway true, and no code set "area->huge" now, so we can drop it.
Signed-off-by: default avatarYiPing Xu <xuyiping@huawei.com>
Reviewed-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a1c0b1a0
...@@ -281,7 +281,6 @@ struct mapping_area { ...@@ -281,7 +281,6 @@ struct mapping_area {
#endif #endif
char *vm_addr; /* address of kmap_atomic()'ed pages */ char *vm_addr; /* address of kmap_atomic()'ed pages */
enum zs_mapmode vm_mm; /* mapping mode */ enum zs_mapmode vm_mm; /* mapping mode */
bool huge;
}; };
static int create_handle_cache(struct zs_pool *pool) static int create_handle_cache(struct zs_pool *pool)
...@@ -1127,11 +1126,9 @@ static void __zs_unmap_object(struct mapping_area *area, ...@@ -1127,11 +1126,9 @@ static void __zs_unmap_object(struct mapping_area *area,
goto out; goto out;
buf = area->vm_buf; buf = area->vm_buf;
if (!area->huge) { buf = buf + ZS_HANDLE_SIZE;
buf = buf + ZS_HANDLE_SIZE; size -= ZS_HANDLE_SIZE;
size -= ZS_HANDLE_SIZE; off += ZS_HANDLE_SIZE;
off += ZS_HANDLE_SIZE;
}
sizes[0] = PAGE_SIZE - off; sizes[0] = PAGE_SIZE - off;
sizes[1] = size - sizes[0]; sizes[1] = size - sizes[0];
......
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