public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Robert Jennings <rcj@linux.vnet.ibm.com>
To: Nitin Gupta <ngupta@vflare.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>,
	Robert Jennings <rcj@linux.vnet.ibm.com>,
	Pekka Enberg <penberg@cs.helsinki.fi>,
	devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/7] zram/xvmalloc: wrap debug code in #ifdef DEBUG
Date: Wed, 26 Jan 2011 11:26:05 -0600	[thread overview]
Message-ID: <20110126172605.GG8446@linux.vnet.ibm.com> (raw)
In-Reply-To: <20110126172148.GB8446@linux.vnet.ibm.com>

This wraps the code, noted by comments as being debug code, with
#ifdef DEBUG so that it is removed from running in non-debug kernels.

Signed-off-by: Robert Jennings <rcj@linux.vnet.ibm.com>
---
 drivers/staging/zram/xvmalloc.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/zram/xvmalloc.c b/drivers/staging/zram/xvmalloc.c
index b3622f1..172514e 100644
--- a/drivers/staging/zram/xvmalloc.c
+++ b/drivers/staging/zram/xvmalloc.c
@@ -219,7 +219,6 @@ static void insert_block(struct xv_pool *pool, struct page *page, u32 offset,
 static void remove_block_head(struct xv_pool *pool,
 			struct block_header *block, u32 slindex)
 {
-	struct block_header *tmpblock;
 	u32 flindex = slindex / BITS_PER_LONG;
 
 	pool->freelist[slindex].page = block->link.next_page;
@@ -232,6 +231,8 @@ static void remove_block_head(struct xv_pool *pool,
 		if (!pool->slbitmap[flindex])
 			__clear_bit(flindex, &pool->flbitmap);
 	} else {
+#ifdef DEBUG
+		struct block_header *tmpblock;
 		/*
 		 * DEBUG ONLY: We need not reinitialize freelist head previous
 		 * pointer to 0 - we never depend on its value. But just for
@@ -242,6 +243,7 @@ static void remove_block_head(struct xv_pool *pool,
 		tmpblock->link.prev_page = 0;
 		tmpblock->link.prev_offset = 0;
 		put_ptr_atomic(tmpblock, KM_USER1);
+#endif
 	}
 }
 
-- 
1.6.0.2


  parent reply	other threads:[~2011-01-26 17:29 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-26 17:21 [PATCH 0/7] zram/xvmalloc: 64K page fixes and optimizations Robert Jennings
2011-01-26 17:22 ` [PATCH 1/7] zram/vmalloc: Correct tunings to enable use with 64K pages Robert Jennings
2011-01-26 17:48   ` Pekka Enberg
2011-01-26 18:50     ` Robert Jennings
2011-01-26 17:23 ` [PATCH 2/7] zram: Prevent overflow in logical block size Robert Jennings
2011-01-26 17:42   ` Pekka Enberg
2011-01-26 19:09     ` Robert Jennings
2011-01-26 19:14       ` Pekka Enberg
2011-01-26 17:23 ` [PATCH 3/7] zram: Speed insertion of new pages with cached idx Robert Jennings
2011-01-26 17:53   ` Pekka Enberg
2011-01-26 19:50     ` Robert Jennings
2011-01-26 17:25 ` [PATCH 4/7] zram/xvmalloc: free bit block insertion optimization Robert Jennings
2011-01-26 17:55   ` Pekka Enberg
2011-01-26 18:40     ` Robert Jennings
2011-01-26 18:51       ` Pekka Enberg
2011-01-26 18:44   ` Nitin Gupta
2011-01-26 17:26 ` Robert Jennings [this message]
2011-01-26 17:44   ` [PATCH 5/7] zram/xvmalloc: wrap debug code in #ifdef DEBUG Pekka Enberg
2011-01-26 18:27     ` Robert Jennings
2011-01-26 17:27 ` [PATCH 6/7] zram/xvmalloc: Close 32byte hole on 64-bit CPUs Robert Jennings
2011-01-26 17:43   ` Pekka Enberg
2011-01-26 17:27 ` [PATCH 7/7] zram: mark the disk as non-rotating media Robert Jennings
2011-01-26 17:44   ` Pekka Enberg
2011-01-26 17:48   ` Dan Carpenter
2011-01-26 17:52   ` Robert Jennings
2011-01-26 18:26     ` Robert Jennings

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110126172605.GG8446@linux.vnet.ibm.com \
    --to=rcj@linux.vnet.ibm.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ngupta@vflare.org \
    --cc=penberg@cs.helsinki.fi \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox