diff options
author | Andi Kleen <andi@firstfloor.org> | 2010-06-14 13:28:03 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2010-06-14 13:28:03 -0400 |
commit | 5a0790c2c4a18435759a70e1562450035d778339 (patch) | |
tree | 80acb12d0e37196cf60ae4ca150c6b556115f302 /fs/jbd2/recovery.c | |
parent | 07a038245b28df9196ffb2e8cc626e9b956a4e23 (diff) |
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 <ak@linux.intel.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2/recovery.c')
-rw-r--r-- | fs/jbd2/recovery.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c index 049281b7cb89..2bc4d5f116f1 100644 --- a/fs/jbd2/recovery.c +++ b/fs/jbd2/recovery.c | |||
@@ -285,12 +285,10 @@ int jbd2_journal_recover(journal_t *journal) | |||
285 | int jbd2_journal_skip_recovery(journal_t *journal) | 285 | int jbd2_journal_skip_recovery(journal_t *journal) |
286 | { | 286 | { |
287 | int err; | 287 | int err; |
288 | journal_superblock_t * sb; | ||
289 | 288 | ||
290 | struct recovery_info info; | 289 | struct recovery_info info; |
291 | 290 | ||
292 | memset (&info, 0, sizeof(info)); | 291 | memset (&info, 0, sizeof(info)); |
293 | sb = journal->j_superblock; | ||
294 | 292 | ||
295 | err = do_one_pass(journal, &info, PASS_SCAN); | 293 | err = do_one_pass(journal, &info, PASS_SCAN); |
296 | 294 | ||
@@ -299,7 +297,8 @@ int jbd2_journal_skip_recovery(journal_t *journal) | |||
299 | ++journal->j_transaction_sequence; | 297 | ++journal->j_transaction_sequence; |
300 | } else { | 298 | } else { |
301 | #ifdef CONFIG_JBD2_DEBUG | 299 | #ifdef CONFIG_JBD2_DEBUG |
302 | int dropped = info.end_transaction - be32_to_cpu(sb->s_sequence); | 300 | int dropped = info.end_transaction - |
301 | be32_to_cpu(journal->j_superblock->s_sequence); | ||
303 | #endif | 302 | #endif |
304 | jbd_debug(1, | 303 | jbd_debug(1, |
305 | "JBD: ignoring %d transaction%s from the journal.\n", | 304 | "JBD: ignoring %d transaction%s from the journal.\n", |
@@ -365,11 +364,6 @@ static int do_one_pass(journal_t *journal, | |||
365 | int tag_bytes = journal_tag_bytes(journal); | 364 | int tag_bytes = journal_tag_bytes(journal); |
366 | __u32 crc32_sum = ~0; /* Transactional Checksums */ | 365 | __u32 crc32_sum = ~0; /* Transactional Checksums */ |
367 | 366 | ||
368 | /* Precompute the maximum metadata descriptors in a descriptor block */ | ||
369 | int MAX_BLOCKS_PER_DESC; | ||
370 | MAX_BLOCKS_PER_DESC = ((journal->j_blocksize-sizeof(journal_header_t)) | ||
371 | / tag_bytes); | ||
372 | |||
373 | /* | 367 | /* |
374 | * First thing is to establish what we expect to find in the log | 368 | * First thing is to establish what we expect to find in the log |
375 | * (in terms of transaction IDs), and where (in terms of log | 369 | * (in terms of transaction IDs), and where (in terms of log |