[JFFS2] kill warning RE debug-only variables

[Linux-MTD Mailing List]

Commit:     a6b1d82d079a99d09761ee5fbc66c49f33b42324
Parent:     78b656b8bf933101b42409b4492734b23427bfc3
commit a6b1d82d079a99d09761ee5fbc66c49f33b42324
Author:     Jeff Garzik <jeff at garzik.org>
AuthorDate: Wed Oct 4 07:57:18 2006 -0400
Commit:     David Woodhouse <dwmw2 at infradead.org>
CommitDate: Wed Oct 4 14:31:01 2006 +0100

    [JFFS2] kill warning RE debug-only variables
    
    gcc emits the following warning on a 'allmodconfig' build:
    
    fs/jffs2/xattr.c: In function ‘unrefer_xattr_datum’:
    fs/jffs2/xattr.c:402: warning: unused variable ‘version’
    fs/jffs2/xattr.c:402: warning: unused variable ‘xid’
    
    Given that these variables are only used in the debug printk, and they
    merely remove a deref, we can easily kill the warning by adding the
    derefs to the debug printk.
    
    Signed-off-by: Jeff Garzik <jeff at garzik.org>
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
---
 fs/jffs2/xattr.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c
index 4da09ce..4bb3f18 100644
--- a/fs/jffs2/xattr.c
+++ b/fs/jffs2/xattr.c
@@ -399,8 +399,6 @@ static void unrefer_xattr_datum(struct j
 {
 	/* must be called under down_write(xattr_sem) */
 	if (atomic_dec_and_lock(&xd->refcnt, &c->erase_completion_lock)) {
-		uint32_t xid = xd->xid, version = xd->version;
-
 		unload_xattr_datum(c, xd);
 		xd->flags |= JFFS2_XFLAGS_DEAD;
 		if (xd->node == (void *)xd) {
@@ -411,7 +409,8 @@ static void unrefer_xattr_datum(struct j
 		}
 		spin_unlock(&c->erase_completion_lock);
 
-		dbg_xattr("xdatum(xid=%u, version=%u) was removed.\n", xid, version);
+		dbg_xattr("xdatum(xid=%u, version=%u) was removed.\n",
+			  xd->xid, xd->version);
 	}
 }