diff options
author | Andi Kleen <andi@firstfloor.org> | 2010-06-10 07:10:53 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2010-07-21 10:01:47 -0400 |
commit | 0411ba7902e09111d6f2041b4697a597d2cf7736 (patch) | |
tree | 65927286bf15ae9161c3ffd2a0f65bea1e8faa6a /fs/jbd/recovery.c | |
parent | 189eef59e70e3e56edf726864629f310d114eefb (diff) |
ext3: Fix set but unused variables
[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>
Diffstat (limited to 'fs/jbd/recovery.c')
-rw-r--r-- | fs/jbd/recovery.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c index 54c9bc9e1b17..81051dafebf5 100644 --- a/fs/jbd/recovery.c +++ b/fs/jbd/recovery.c | |||
@@ -283,12 +283,9 @@ int journal_recover(journal_t *journal) | |||
283 | int journal_skip_recovery(journal_t *journal) | 283 | int journal_skip_recovery(journal_t *journal) |
284 | { | 284 | { |
285 | int err; | 285 | int err; |
286 | journal_superblock_t * sb; | ||
287 | |||
288 | struct recovery_info info; | 286 | struct recovery_info info; |
289 | 287 | ||
290 | memset (&info, 0, sizeof(info)); | 288 | memset (&info, 0, sizeof(info)); |
291 | sb = journal->j_superblock; | ||
292 | 289 | ||
293 | err = do_one_pass(journal, &info, PASS_SCAN); | 290 | err = do_one_pass(journal, &info, PASS_SCAN); |
294 | 291 | ||
@@ -297,7 +294,8 @@ int journal_skip_recovery(journal_t *journal) | |||
297 | ++journal->j_transaction_sequence; | 294 | ++journal->j_transaction_sequence; |
298 | } else { | 295 | } else { |
299 | #ifdef CONFIG_JBD_DEBUG | 296 | #ifdef CONFIG_JBD_DEBUG |
300 | int dropped = info.end_transaction - be32_to_cpu(sb->s_sequence); | 297 | int dropped = info.end_transaction - |
298 | be32_to_cpu(journal->j_superblock->s_sequence); | ||
301 | #endif | 299 | #endif |
302 | jbd_debug(1, | 300 | jbd_debug(1, |
303 | "JBD: ignoring %d transaction%s from the journal.\n", | 301 | "JBD: ignoring %d transaction%s from the journal.\n", |
@@ -321,11 +319,6 @@ static int do_one_pass(journal_t *journal, | |||
321 | unsigned int sequence; | 319 | unsigned int sequence; |
322 | int blocktype; | 320 | int blocktype; |
323 | 321 | ||
324 | /* Precompute the maximum metadata descriptors in a descriptor block */ | ||
325 | int MAX_BLOCKS_PER_DESC; | ||
326 | MAX_BLOCKS_PER_DESC = ((journal->j_blocksize-sizeof(journal_header_t)) | ||
327 | / sizeof(journal_block_tag_t)); | ||
328 | |||
329 | /* | 322 | /* |
330 | * First thing is to establish what we expect to find in the log | 323 | * First thing is to establish what we expect to find in the log |
331 | * (in terms of transaction IDs), and where (in terms of log | 324 | * (in terms of transaction IDs), and where (in terms of log |