diff options
Diffstat (limited to 'fs/jbd/journal.c')
-rw-r--r-- | fs/jbd/journal.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 93d1e47647bd..f19ce94693d8 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c | |||
@@ -1281,13 +1281,9 @@ int journal_check_used_features (journal_t *journal, unsigned long compat, | |||
1281 | int journal_check_available_features (journal_t *journal, unsigned long compat, | 1281 | int journal_check_available_features (journal_t *journal, unsigned long compat, |
1282 | unsigned long ro, unsigned long incompat) | 1282 | unsigned long ro, unsigned long incompat) |
1283 | { | 1283 | { |
1284 | journal_superblock_t *sb; | ||
1285 | |||
1286 | if (!compat && !ro && !incompat) | 1284 | if (!compat && !ro && !incompat) |
1287 | return 1; | 1285 | return 1; |
1288 | 1286 | ||
1289 | sb = journal->j_superblock; | ||
1290 | |||
1291 | /* We can support any known requested features iff the | 1287 | /* We can support any known requested features iff the |
1292 | * superblock is in version 2. Otherwise we fail to support any | 1288 | * superblock is in version 2. Otherwise we fail to support any |
1293 | * extended sb features. */ | 1289 | * extended sb features. */ |
@@ -1481,7 +1477,6 @@ int journal_flush(journal_t *journal) | |||
1481 | 1477 | ||
1482 | int journal_wipe(journal_t *journal, int write) | 1478 | int journal_wipe(journal_t *journal, int write) |
1483 | { | 1479 | { |
1484 | journal_superblock_t *sb; | ||
1485 | int err = 0; | 1480 | int err = 0; |
1486 | 1481 | ||
1487 | J_ASSERT (!(journal->j_flags & JFS_LOADED)); | 1482 | J_ASSERT (!(journal->j_flags & JFS_LOADED)); |
@@ -1490,8 +1485,6 @@ int journal_wipe(journal_t *journal, int write) | |||
1490 | if (err) | 1485 | if (err) |
1491 | return err; | 1486 | return err; |
1492 | 1487 | ||
1493 | sb = journal->j_superblock; | ||
1494 | |||
1495 | if (!journal->j_tail) | 1488 | if (!journal->j_tail) |
1496 | goto no_recovery; | 1489 | goto no_recovery; |
1497 | 1490 | ||