Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 283100
b: refs/heads/master
c: b18c1c6
h: refs/heads/master
v: v3
  • Loading branch information
Davidlohr Bueso authored and Linus Torvalds committed Jan 11, 2012
1 parent e65823e commit bc68f44
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e74a8f2edb92cb690b467cea0ab652c509e9f624
refs/heads/master: b18c1c6e0c90cbcd38ba879bd63a44c94e4f7301
11 changes: 4 additions & 7 deletions trunk/fs/reiserfs/journal.c
Original file line number Diff line number Diff line change
Expand Up @@ -2896,14 +2896,13 @@ int journal_transaction_should_end(struct reiserfs_transaction_handle *th,
journal->j_cnode_free < (journal->j_trans_max * 3)) {
return 1;
}
/* protected by the BKL here */

journal->j_len_alloc += new_alloc;
th->t_blocks_allocated += new_alloc ;
return 0;
}

/* this must be called inside a transaction, and requires the
** kernel_lock to be held
/* this must be called inside a transaction
*/
void reiserfs_block_writes(struct reiserfs_transaction_handle *th)
{
Expand All @@ -2914,8 +2913,7 @@ void reiserfs_block_writes(struct reiserfs_transaction_handle *th)
return;
}

/* this must be called without a transaction started, and does not
** require BKL
/* this must be called without a transaction started
*/
void reiserfs_allow_writes(struct super_block *s)
{
Expand All @@ -2924,8 +2922,7 @@ void reiserfs_allow_writes(struct super_block *s)
wake_up(&journal->j_join_wait);
}

/* this must be called without a transaction started, and does not
** require BKL
/* this must be called without a transaction started
*/
void reiserfs_wait_on_write_block(struct super_block *s)
{
Expand Down

0 comments on commit bc68f44

Please sign in to comment.