diff options
| author | Andrew Morton <akpm@osdl.org> | 2003-07-17 19:25:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-07-17 19:25:07 -0700 |
| commit | 5acf32eeb3082c5ec89bbd9df2b8bda251ca1bc1 (patch) | |
| tree | e6ecf86d638072ab44e5af91b576741df53c3fff /fs | |
| parent | c07f63b348199d5f8645ef2556de12536d7c0061 (diff) | |
[PATCH] misc fixes
- i460-agp linkage fix ("Luck, Tony" <tony.luck@intel.com>)
- Don't reimplement offsetof() in hfs
- NBD warning fix
- Remove unneeded null-pointer test in journal_stop (Andreas Gruenbacher)
- remove debug stuff in journal_dirty_metadata()
- slab.c typo fixes (Lev Makhlis <mlev@despammed.com>)
- In devfs_mk_cdev() error path, don't print `buf' until we've written
something into it. (Reported by Gergely Nagy <algernon@gandalph.mad.hu>)
- Two ISA sound drivers had their kmalloc() args reversed (Spotted by Steve
French)
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jbd/transaction.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 1423dadf3db9..2861ee44cb11 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c @@ -1106,16 +1106,6 @@ int journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) if (jh->b_transaction == handle->h_transaction && jh->b_jlist == BJ_Metadata) { JBUFFER_TRACE(jh, "fastpath"); - console_verbose(); - if (jh->b_transaction != journal->j_running_transaction) { - printk("jh->b_transaction=%p\n", jh->b_transaction); - printk("journal->j_running_transaction=%p\n", - journal->j_running_transaction); - printk("handle->h_transaction=%p\n", - handle->h_transaction); - printk("journal->j_committing_transaction=%p\n", - journal->j_committing_transaction); - } J_ASSERT_JH(jh, jh->b_transaction == journal->j_running_transaction); goto out_unlock_bh; @@ -1328,9 +1318,6 @@ int journal_stop(handle_t *handle) journal_t *journal = transaction->t_journal; int old_handle_count, err; - if (!handle) - return 0; - J_ASSERT(transaction->t_updates > 0); J_ASSERT(journal_current_handle() == handle); |