From 445e77f2fd056704625971f11334d86838b779d1 Mon Sep 17 00:00:00 2001 From: Robert Jennings Date: Fri, 28 Jan 2011 08:58:54 -0600 Subject: [PATCH] --- yaml --- r: 235846 b: refs/heads/master c: e3f201b541ff6748db77b857d2ae69fc9dbbee11 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/zram/xvmalloc.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 300150a3800b..48feb0585fa7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b19b8d45b216ff3186f066b31937bdbde066f08 +refs/heads/master: e3f201b541ff6748db77b857d2ae69fc9dbbee11 diff --git a/trunk/drivers/staging/zram/xvmalloc.c b/trunk/drivers/staging/zram/xvmalloc.c index 3ed744ba7ba0..9cbe04a496e1 100644 --- a/trunk/drivers/staging/zram/xvmalloc.c +++ b/trunk/drivers/staging/zram/xvmalloc.c @@ -200,6 +200,8 @@ static void insert_block(struct xv_pool *pool, struct page *page, u32 offset, nextblock->link.prev_page = page; nextblock->link.prev_offset = offset; put_ptr_atomic(nextblock, KM_USER1); + /* If there was a next page then the free bits are set. */ + return; } __set_bit(slindex % BITS_PER_LONG, &pool->slbitmap[flindex]);