From patchwork Mon Jul 8 05:23:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jon ernst X-Patchwork-Id: 257464 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 676AF2C00AB for ; Mon, 8 Jul 2013 15:23:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753534Ab3GHFXu (ORCPT ); Mon, 8 Jul 2013 01:23:50 -0400 Received: from mail-pb0-f66.google.com ([209.85.160.66]:52097 "EHLO mail-pb0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753454Ab3GHFXt (ORCPT ); Mon, 8 Jul 2013 01:23:49 -0400 Received: by mail-pb0-f66.google.com with SMTP id mc8so2418016pbc.1 for ; Sun, 07 Jul 2013 22:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=E8UNnXQgtT6FnljN7dGIpHcEjDi2x4YJeAO0X/ynbi0=; b=zKmyADjSfGKQjCestIK0j36goK3nsxMy7/uMatkm2E1XH8xg1Ld9oYjcO3o6AkQWpJ 5LW93pMa0zZzyKOMzbcUQqAnW5+0IqaM6G1Gs5R1YpCfBKTgd15UtgmSimCSw6IuLCSV iWQaL+gPTuL9pr8KZhbPPQO9Dm0OPv4EMqLfca8l82eQemZDYezKdXdq7k0k8SCyvy7T vF1mPjsr1ToWhsAnPL50gnf5SZpUA6pzkhXKAEwn5wFDX9NFgdFlJfD+ynCfVbnKp24K NKY67K+KWJ8mq3Wb3lHcbhtZDufBKAeEf6Wj5dOYalgxdnbcYPOqBFPzqPyXhPy4pde8 dHoA== MIME-Version: 1.0 X-Received: by 10.66.178.229 with SMTP id db5mr11086239pac.105.1373261029229; Sun, 07 Jul 2013 22:23:49 -0700 (PDT) Received: by 10.70.7.129 with HTTP; Sun, 7 Jul 2013 22:23:49 -0700 (PDT) Date: Mon, 8 Jul 2013 05:23:49 +0000 Message-ID: Subject: [PATCH] ext4: deleted "set but not used" variables From: jon ernst To: linux-ext4@vger.kernel.org Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org to delete "set but not used" variables Signed-off-by: Jon Ernst Signed-off-by: Zheng Liu Reviewed-by: Zheng Liu --- -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 7097b0f..df0e9b2 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4391,7 +4391,6 @@ void ext4_ext_truncate(handle_t *handle, struct inode *inode) { struct super_block *sb = inode->i_sb; ext4_lblk_t last_block; - int err = 0; /* * TODO: optimization is possible here. @@ -4405,9 +4404,9 @@ void ext4_ext_truncate(handle_t *handle, struct inode *inode) last_block = (inode->i_size + sb->s_blocksize - 1) >> EXT4_BLOCK_SIZE_BITS(sb); - err = ext4_es_remove_extent(inode, last_block, - EXT_MAX_BLOCKS - last_block); - err = ext4_ext_remove_space(inode, last_block, EXT_MAX_BLOCKS - 1); + ext4_es_remove_extent(inode, last_block, + EXT_MAX_BLOCKS - last_block); + ext4_ext_remove_space(inode, last_block, EXT_MAX_BLOCKS - 1); } static void ext4_falloc_update_inode(struct inode *inode, diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index b8a0746..35f43e9 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -994,11 +994,9 @@ static int ext4_add_dirent_to_inline(handle_t *handle, struct inode *dir = dentry->d_parent->d_inode; const char *name = dentry->d_name.name; int namelen = dentry->d_name.len; - unsigned short reclen; int err; struct ext4_dir_entry_2 *de; - reclen = EXT4_DIR_REC_LEN(namelen); err = ext4_find_dest_de(dir, inode, iloc->bh, inline_start, inline_size, name, namelen, &de); @@ -1870,7 +1868,6 @@ int ext4_try_to_evict_inline_data(handle_t *handle, { int error; struct ext4_xattr_entry *entry; - struct ext4_xattr_ibody_header *header; struct ext4_inode *raw_inode; struct ext4_iloc iloc; @@ -1879,7 +1876,6 @@ int ext4_try_to_evict_inline_data(handle_t *handle, return error; raw_inode = ext4_raw_inode(&iloc); - header = IHDR(inode, raw_inode); entry = (struct ext4_xattr_entry *)((void *)raw_inode + EXT4_I(inode)->i_inline_off); if (EXT4_XATTR_LEN(entry->e_name_len) + diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 9491ac0..38b5169 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -100,7 +100,6 @@ static long swap_inode_boot_loader(struct super_block *sb, handle_t *handle; int err; struct inode *inode_bl; - struct ext4_inode_info *ei; struct ext4_inode_info *ei_bl; struct ext4_sb_info *sbi; @@ -115,7 +114,6 @@ static long swap_inode_boot_loader(struct super_block *sb, } sbi = EXT4_SB(sb); - ei = EXT4_I(inode); inode_bl = ext4_iget(sb, EXT4_BOOT_LOADER_INO); if (IS_ERR(inode_bl)) {