From patchwork Wed Jan 16 16:45:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 212813 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 5E9322C0085 for ; Thu, 17 Jan 2013 03:45:44 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TvW7L-0002hZ-77; Wed, 16 Jan 2013 16:45:35 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TvW7I-0002h0-Fv for kernel-team@lists.ubuntu.com; Wed, 16 Jan 2013 16:45:32 +0000 Received: from bl20-125-6.dsl.telepac.pt ([2.81.125.6] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1TvW7I-0000FT-0k for kernel-team@lists.ubuntu.com; Wed, 16 Jan 2013 16:45:32 +0000 From: Luis Henriques To: kernel-team@lists.ubuntu.com Subject: [Oneiric CVE 1/2] ext4: quiet 'unused variables' compile warnings Date: Wed, 16 Jan 2013 16:45:27 +0000 Message-Id: <1358354728-3642-2-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1358354728-3642-1-git-send-email-luis.henriques@canonical.com> References: <1358354728-3642-1-git-send-email-luis.henriques@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Yongqiang Yang CVE-2012-4508 BugLink: http://bugs.launchpad.net/bugs/1071314 Unused variables was deleted. Signed-off-by: Yongqiang Yang Signed-off-by: "Theodore Ts'o" (cherry picked from commit 9331b6261058eb85ae7c57ab8ac279e7fdaa9f04) Signed-off-by: Luis Henriques --- fs/ext4/extents.c | 2 -- fs/ext4/mballoc.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 611647b..8ad9b56 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3109,12 +3109,10 @@ static int ext4_convert_unwritten_extents_endio(handle_t *handle, struct ext4_ext_path *path) { struct ext4_extent *ex; - struct ext4_extent_header *eh; int depth; int err = 0; depth = ext_depth(inode); - eh = path[depth].p_hdr; ex = path[depth].p_ext; ext_debug("ext4_convert_unwritten_extents_endio: inode %lu, logical" diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index b6adf68..d7d3962 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4668,12 +4668,10 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb, struct ext4_buddy e4b; int err = 0, ret, blk_free_count; ext4_grpblk_t blocks_freed; - struct ext4_group_info *grp; ext4_debug("Adding block(s) %llu-%llu\n", block, block + count - 1); ext4_get_group_no_and_offset(sb, block, &block_group, &bit); - grp = ext4_get_group_info(sb, block_group); /* * Check to see if we are freeing blocks across a group * boundary.