summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Jennings <rcj@linux.vnet.ibm.com>2011-01-28 08:58:54 -0600
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-04 13:29:11 -0800
commite3f201b541ff6748db77b857d2ae69fc9dbbee11 (patch)
tree15d3da4da9a99685d48bc87c991cb0fd0a60310f
parent7b19b8d45b216ff3186f066b31937bdbde066f08 (diff)
downloadlinux-3.10-e3f201b541ff6748db77b857d2ae69fc9dbbee11.tar.gz
linux-3.10-e3f201b541ff6748db77b857d2ae69fc9dbbee11.tar.bz2
linux-3.10-e3f201b541ff6748db77b857d2ae69fc9dbbee11.zip
zram/xvmalloc: free bit block insertion optimization
This change is in a conditional block which is entered only when there is an existing data block on the freelist where the insert has taken place. The new block is pushed onto the freelist stack and this conditional block is updating links in the prior stack head to point to the new stack head. After this conditional block the first-/second-level indices are updated to indicate that there is a free block at this location. This patch adds an immediate return from the conditional block to avoid setting bits again to indicate a free block on this freelist. The bits would already be set because there was an existing free block on this freelist. Signed-off-by: Robert Jennings <rcj@linux.vnet.ibm.com> Reviewed-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/zram/xvmalloc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/zram/xvmalloc.c b/drivers/staging/zram/xvmalloc.c
index 3ed744ba7ba..9cbe04a496e 100644
--- a/drivers/staging/zram/xvmalloc.c
+++ b/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]);