Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ext3: Fix set but unused variables

Browse source 
[tytso@mit.edu: Fix compilation with CONFIG_JBD_DEBUG enabled]

Acked-by: tytso@mit.edu
cc: linux-ext4@vger.kernel.org
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Andi Kleen 2010-06-10 13:10:53 +02:00 • committed by Jan Kara
parent 189eef59e7
commit 0411ba7902
4 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs/ext3/namei.c
View file

@ -1447,7 +1447,6 @@ static int ext3_add_entry (handle_t *handle, struct dentry *dentry,
struct inode *inode) struct inode *inode)
{ {
struct inode *dir = dentry->d_parent->d_inode; struct inode *dir = dentry->d_parent->d_inode;
unsigned long offset;
struct buffer_head * bh; struct buffer_head * bh;
struct ext3_dir_entry_2 *de; struct ext3_dir_entry_2 *de;
struct super_block * sb; struct super_block * sb;
@ -1469,7 +1468,7 @@ static int ext3_add_entry (handle_t *handle, struct dentry *dentry,
ext3_mark_inode_dirty(handle, dir); ext3_mark_inode_dirty(handle, dir);
} }
blocks = dir->i_size >> sb->s_blocksize_bits; blocks = dir->i_size >> sb->s_blocksize_bits;
for (block = 0, offset = 0; block < blocks; block++) { for (block = 0; block < blocks; block++) {
bh = ext3_bread(handle, dir, block, 0, &retval); bh = ext3_bread(handle, dir, block, 0, &retval);
if(!bh) if(!bh)
return retval; return retval;

2
fs/ext3/resize.c
View file

@ -964,7 +964,6 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
ext3_fsblk_t n_blocks_count) ext3_fsblk_t n_blocks_count)
{ {
ext3_fsblk_t o_blocks_count; ext3_fsblk_t o_blocks_count;
unsigned long o_groups_count;
ext3_grpblk_t last; ext3_grpblk_t last;
ext3_grpblk_t add; ext3_grpblk_t add;
struct buffer_head * bh; struct buffer_head * bh;
@ -976,7 +975,6 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
* yet: we're going to revalidate es->s_blocks_count after * yet: we're going to revalidate es->s_blocks_count after
* taking the s_resize_lock below. */ * taking the s_resize_lock below. */
o_blocks_count = le32_to_cpu(es->s_blocks_count); o_blocks_count = le32_to_cpu(es->s_blocks_count);
o_groups_count = EXT3_SB(sb)->s_groups_count;
if (test_opt(sb, DEBUG)) if (test_opt(sb, DEBUG))
printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK" uto "E3FSBLK" blocks\n", printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK" uto "E3FSBLK" blocks\n",

7
fs/jbd/journal.c
View file

@ -1281,13 +1281,9 @@ int journal_check_used_features (journal_t *journal, unsigned long compat,
int journal_check_available_features (journal_t *journal, unsigned long compat, int journal_check_available_features (journal_t *journal, unsigned long compat,
unsigned long ro, unsigned long incompat) unsigned long ro, unsigned long incompat)
{ {
journal_superblock_t *sb;
if (!compat && !ro && !incompat) if (!compat && !ro && !incompat)
return 1; return 1;
sb = journal->j_superblock;
/* We can support any known requested features iff the /* We can support any known requested features iff the
* superblock is in version 2. Otherwise we fail to support any * superblock is in version 2. Otherwise we fail to support any
* extended sb features. */ * extended sb features. */
@ -1481,7 +1477,6 @@ int journal_flush(journal_t *journal)
int journal_wipe(journal_t *journal, int write) int journal_wipe(journal_t *journal, int write)
{ {
journal_superblock_t *sb;
int err = 0; int err = 0;
J_ASSERT (!(journal->j_flags & JFS_LOADED)); J_ASSERT (!(journal->j_flags & JFS_LOADED));
@ -1490,8 +1485,6 @@ int journal_wipe(journal_t *journal, int write)
if (err) if (err)
return err; return err;
sb = journal->j_superblock;
if (!journal->j_tail) if (!journal->j_tail)
goto no_recovery; goto no_recovery;

11
fs/jbd/recovery.c
View file

@ -283,12 +283,9 @@ int journal_recover(journal_t *journal)
int journal_skip_recovery(journal_t *journal) int journal_skip_recovery(journal_t *journal)
{ {
int err; int err;
journal_superblock_t * sb;
struct recovery_info info; struct recovery_info info;
memset (&info, 0, sizeof(info)); memset (&info, 0, sizeof(info));
sb = journal->j_superblock;
err = do_one_pass(journal, &info, PASS_SCAN); err = do_one_pass(journal, &info, PASS_SCAN);
@ -297,7 +294,8 @@ int journal_skip_recovery(journal_t *journal)
++journal->j_transaction_sequence; ++journal->j_transaction_sequence;
} else { } else {
#ifdef CONFIG_JBD_DEBUG #ifdef CONFIG_JBD_DEBUG
int dropped = info.end_transaction - be32_to_cpu(sb->s_sequence); int dropped = info.end_transaction -
be32_to_cpu(journal->j_superblock->s_sequence);
#endif #endif
jbd_debug(1, jbd_debug(1,
"JBD: ignoring %d transaction%s from the journal.\n", "JBD: ignoring %d transaction%s from the journal.\n",
@ -321,11 +319,6 @@ static int do_one_pass(journal_t *journal,
unsigned int sequence; unsigned int sequence;
int blocktype; int blocktype;
/* Precompute the maximum metadata descriptors in a descriptor block */
int MAX_BLOCKS_PER_DESC;
MAX_BLOCKS_PER_DESC = ((journal->j_blocksize-sizeof(journal_header_t))
/ sizeof(journal_block_tag_t));
/* /*
* First thing is to establish what we expect to find in the log * First thing is to establish what we expect to find in the log
* (in terms of transaction IDs), and where (in terms of log * (in terms of transaction IDs), and where (in terms of log