--- linux/fs/reiserfs/journal.c Sat Sep 8 08:05:32 2001 +++ linux/fs/reiserfs/journal.c Sat Sep 22 17:10:57 2001 @@ -746,6 +746,8 @@ } atomic_set(&(jl->j_commit_flushing), 0) ; wake_up(&(jl->j_commit_wait)) ; + + s->s_dirt = 1 ; return 0 ; } @@ -2378,7 +2381,6 @@ int count = 0; int start ; time_t now ; - int keep_dirty = 0 ; struct reiserfs_transaction_handle th ; start = SB_JOURNAL_LIST_INDEX(p_s_sb) ; @@ -2388,10 +2390,6 @@ if (SB_JOURNAL_LIST_INDEX(p_s_sb) < 0) { return 0 ; } - if (!strcmp(current->comm, "kupdate")) { - immediate = 0 ; - keep_dirty = 1 ; - } /* starting with oldest, loop until we get to the start */ i = (SB_JOURNAL_LIST_INDEX(p_s_sb) + 1) % JOURNAL_LIST_COUNT ; while(i != start) { @@ -2416,7 +2414,6 @@ reiserfs_prepare_for_journal(p_s_sb, SB_BUFFER_WITH_SB(p_s_sb), 1) ; journal_mark_dirty(&th, p_s_sb, SB_BUFFER_WITH_SB(p_s_sb)) ; do_journal_end(&th, p_s_sb,1, COMMIT_NOW) ; - keep_dirty = 0 ; } else if (immediate) { /* belongs above, but I wanted this to be very explicit as a special case. If they say to flush, we must be sure old transactions hit the disk too. */ journal_join(&th, p_s_sb, 1) ; @@ -2424,8 +2421,8 @@ journal_mark_dirty(&th, p_s_sb, SB_BUFFER_WITH_SB(p_s_sb)) ; do_journal_end(&th, p_s_sb,1, COMMIT_NOW | WAIT) ; } - keep_dirty |= reiserfs_journal_kupdate(p_s_sb) ; - return keep_dirty ; + reiserfs_journal_kupdate(p_s_sb) ; + return 0 ; } /* .