diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 09:27:27 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 09:27:27 -0400 |
| commit | 38b22b6e9f46ab8f73ef5734f0e0a000766a9258 (patch) | |
| tree | 2ccc41ef55918d3af43e444bde7648562a031559 /fs/reiserfs/journal.c | |
| parent | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (diff) | |
| parent | b3e112bcc19abd8e9657dca34a87316786e096f3 (diff) | |
Automerge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'fs/reiserfs/journal.c')
| -rw-r--r-- | fs/reiserfs/journal.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index 3072cfdee959..7b87707acc36 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
| @@ -2631,6 +2631,8 @@ static int do_journal_begin_r(struct reiserfs_transaction_handle *th, struct sup | |||
| 2631 | int retval; | 2631 | int retval; |
| 2632 | 2632 | ||
| 2633 | reiserfs_check_lock_depth(p_s_sb, "journal_begin") ; | 2633 | reiserfs_check_lock_depth(p_s_sb, "journal_begin") ; |
| 2634 | if (nblocks > journal->j_trans_max) | ||
| 2635 | BUG(); | ||
| 2634 | 2636 | ||
| 2635 | PROC_INFO_INC( p_s_sb, journal.journal_being ); | 2637 | PROC_INFO_INC( p_s_sb, journal.journal_being ); |
| 2636 | /* set here for journal_join */ | 2638 | /* set here for journal_join */ |