git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
fs
/
reiserfs
/
journal.c
diff --git
a/fs/reiserfs/journal.c
b/fs/reiserfs/journal.c
index
1b73529
..
5a9d272
100644
(file)
--- a/
fs/reiserfs/journal.c
+++ b/
fs/reiserfs/journal.c
@@
-2227,9
+2227,6
@@
static int journal_read_transaction(struct super_block *p_s_sb,
journal->j_start = cur_dblock - SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb);
journal->j_last_flush_trans_id = trans_id;
journal->j_trans_id = trans_id + 1;
journal->j_start = cur_dblock - SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb);
journal->j_last_flush_trans_id = trans_id;
journal->j_trans_id = trans_id + 1;
- /* check for trans_id overflow */
- if (journal->j_trans_id == 0)
- journal->j_trans_id = 10;
brelse(c_bh);
brelse(d_bh);
kfree(log_blocks);
brelse(c_bh);
brelse(d_bh);
kfree(log_blocks);
@@
-2453,9
+2450,6
@@
static int journal_read(struct super_block *p_s_sb)
journal->j_start = le32_to_cpu(jh->j_first_unflushed_offset);
journal->j_trans_id =
le32_to_cpu(jh->j_last_flush_trans_id) + 1;
journal->j_start = le32_to_cpu(jh->j_first_unflushed_offset);
journal->j_trans_id =
le32_to_cpu(jh->j_last_flush_trans_id) + 1;
- /* check for trans_id overflow */
- if (journal->j_trans_id == 0)
- journal->j_trans_id = 10;
journal->j_last_flush_trans_id =
le32_to_cpu(jh->j_last_flush_trans_id);
journal->j_mount_id = le32_to_cpu(jh->j_mount_id) + 1;
journal->j_last_flush_trans_id =
le32_to_cpu(jh->j_last_flush_trans_id);
journal->j_mount_id = le32_to_cpu(jh->j_mount_id) + 1;
@@
-3879,8
+3873,8
@@
static int do_journal_end(struct reiserfs_transaction_handle *th,
int cur_write_start = 0; /* start index of current log write */
int old_start;
int i;
int cur_write_start = 0; /* start index of current log write */
int old_start;
int i;
- int flush;
- int wait_on_commit;
+ int flush
= flags & FLUSH_ALL
;
+ int wait_on_commit
= flags & WAIT
;
struct reiserfs_journal_list *jl, *temp_jl;
struct list_head *entry, *safe;
unsigned long jindex;
struct reiserfs_journal_list *jl, *temp_jl;
struct list_head *entry, *safe;
unsigned long jindex;
@@
-3890,13
+3884,6
@@
static int do_journal_end(struct reiserfs_transaction_handle *th,
BUG_ON(th->t_refcount > 1);
BUG_ON(!th->t_trans_id);
BUG_ON(th->t_refcount > 1);
BUG_ON(!th->t_trans_id);
- /* protect flush_older_commits from doing mistakes if the
- transaction ID counter gets overflowed. */
- if (th->t_trans_id == ~0UL)
- flags |= FLUSH_ALL | COMMIT_NOW | WAIT;
- flush = flags & FLUSH_ALL;
- wait_on_commit = flags & WAIT;
-
put_fs_excl();
current->journal_info = th->t_handle_save;
reiserfs_check_lock_depth(p_s_sb, "journal end");
put_fs_excl();
current->journal_info = th->t_handle_save;
reiserfs_check_lock_depth(p_s_sb, "journal end");
@@
-4118,9
+4105,7
@@
static int do_journal_end(struct reiserfs_transaction_handle *th,
journal->j_first = NULL;
journal->j_len = 0;
journal->j_trans_start_time = 0;
journal->j_first = NULL;
journal->j_len = 0;
journal->j_trans_start_time = 0;
- /* check for trans_id overflow */
- if (++journal->j_trans_id == 0)
- journal->j_trans_id = 10;
+ journal->j_trans_id++;
journal->j_current_jl->j_trans_id = journal->j_trans_id;
journal->j_must_wait = 0;
journal->j_len_alloc = 0;
journal->j_current_jl->j_trans_id = journal->j_trans_id;
journal->j_must_wait = 0;
journal->j_len_alloc = 0;