1 diff -rup linux-2.4.20-uml/fs/jbd/transaction.c linux-2.4.21-rc2/fs/jbd/transaction.c
2 --- linux-2.4.20-uml/fs/jbd/transaction.c Thu Nov 28 16:53:15 2002
3 +++ linux-2.4.21-rc2/fs/jbd/transaction.c Fri May 16 11:00:40 2003
4 @@ -1109,7 +1142,6 @@ int journal_dirty_metadata (handle_t *ha
6 spin_lock(&journal_datalist_lock);
7 set_bit(BH_JBDDirty, &bh->b_state);
8 - set_buffer_flushtime(bh);
10 J_ASSERT_JH(jh, jh->b_transaction != NULL);
12 @@ -2035,6 +2093,13 @@ void journal_file_buffer(struct journal_
13 spin_unlock(&journal_datalist_lock);
16 +static void jbd_refile_buffer(struct buffer_head *bh)
18 + if (buffer_dirty(bh) && (bh->b_list != BUF_DIRTY))
19 + set_buffer_flushtime(bh);
24 * Remove a buffer from its current buffer list in preparation for
25 * dropping it from its current transaction entirely. If the buffer has
26 @@ -2055,7 +2120,7 @@ void __journal_refile_buffer(struct jour
27 __journal_unfile_buffer(jh);
28 jh->b_transaction = NULL;
29 /* Onto BUF_DIRTY for writeback */
30 - refile_buffer(jh2bh(jh));
31 + jbd_refile_buffer(jh2bh(jh));