mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
ext4: remove initialized but not read variables
No real bugs found, just removed some dead code. Found by gcc 4.6's new warnings. Signed-off-by: Andi Kleen <[email protected]> Signed-off-by: "Theodore Ts'o" <[email protected]>
This commit is contained in:
parent
07a038245b
commit
5a0790c2c4
7 changed files with 10 additions and 50 deletions
|
|
@ -1392,13 +1392,9 @@ int jbd2_journal_check_used_features (journal_t *journal, unsigned long compat,
|
|||
int jbd2_journal_check_available_features (journal_t *journal, unsigned long compat,
|
||||
unsigned long ro, unsigned long incompat)
|
||||
{
|
||||
journal_superblock_t *sb;
|
||||
|
||||
if (!compat && !ro && !incompat)
|
||||
return 1;
|
||||
|
||||
sb = journal->j_superblock;
|
||||
|
||||
/* We can support any known requested features iff the
|
||||
* superblock is in version 2. Otherwise we fail to support any
|
||||
* extended sb features. */
|
||||
|
|
@ -1618,7 +1614,6 @@ int jbd2_journal_flush(journal_t *journal)
|
|||
|
||||
int jbd2_journal_wipe(journal_t *journal, int write)
|
||||
{
|
||||
journal_superblock_t *sb;
|
||||
int err = 0;
|
||||
|
||||
J_ASSERT (!(journal->j_flags & JBD2_LOADED));
|
||||
|
|
@ -1627,8 +1622,6 @@ int jbd2_journal_wipe(journal_t *journal, int write)
|
|||
if (err)
|
||||
return err;
|
||||
|
||||
sb = journal->j_superblock;
|
||||
|
||||
if (!journal->j_tail)
|
||||
goto no_recovery;
|
||||
|
||||
|
|
@ -2202,8 +2195,6 @@ void jbd2_journal_init_jbd_inode(struct jbd2_inode *jinode, struct inode *inode)
|
|||
void jbd2_journal_release_jbd_inode(journal_t *journal,
|
||||
struct jbd2_inode *jinode)
|
||||
{
|
||||
int writeout = 0;
|
||||
|
||||
if (!journal)
|
||||
return;
|
||||
restart:
|
||||
|
|
@ -2220,9 +2211,6 @@ restart:
|
|||
goto restart;
|
||||
}
|
||||
|
||||
/* Do we need to wait for data writeback? */
|
||||
if (journal->j_committing_transaction == jinode->i_transaction)
|
||||
writeout = 1;
|
||||
if (jinode->i_transaction) {
|
||||
list_del(&jinode->i_list);
|
||||
jinode->i_transaction = NULL;
|
||||
|
|
|
|||
|
|
@ -285,12 +285,10 @@ int jbd2_journal_recover(journal_t *journal)
|
|||
int jbd2_journal_skip_recovery(journal_t *journal)
|
||||
{
|
||||
int err;
|
||||
journal_superblock_t * sb;
|
||||
|
||||
struct recovery_info info;
|
||||
|
||||
memset (&info, 0, sizeof(info));
|
||||
sb = journal->j_superblock;
|
||||
|
||||
err = do_one_pass(journal, &info, PASS_SCAN);
|
||||
|
||||
|
|
@ -299,7 +297,8 @@ int jbd2_journal_skip_recovery(journal_t *journal)
|
|||
++journal->j_transaction_sequence;
|
||||
} else {
|
||||
#ifdef CONFIG_JBD2_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
|
||||
jbd_debug(1,
|
||||
"JBD: ignoring %d transaction%s from the journal.\n",
|
||||
|
|
@ -365,11 +364,6 @@ static int do_one_pass(journal_t *journal,
|
|||
int tag_bytes = journal_tag_bytes(journal);
|
||||
__u32 crc32_sum = ~0; /* Transactional Checksums */
|
||||
|
||||
/* 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))
|
||||
/ tag_bytes);
|
||||
|
||||
/*
|
||||
* First thing is to establish what we expect to find in the log
|
||||
* (in terms of transaction IDs), and where (in terms of log
|
||||
|
|
|
|||
Loading…
Reference in a new issue