mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing
* 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing: reiserfs: Fix vmalloc call under reiserfs lock
This commit is contained in:
commit
13af75740f
1 changed files with 2 additions and 0 deletions
|
@ -2913,7 +2913,9 @@ int journal_init(struct super_block *sb, const char *j_dev_name,
|
|||
journal->j_mount_id = 10;
|
||||
journal->j_state = 0;
|
||||
atomic_set(&(journal->j_jlock), 0);
|
||||
reiserfs_write_unlock(sb);
|
||||
journal->j_cnode_free_list = allocate_cnodes(num_cnodes);
|
||||
reiserfs_write_lock(sb);
|
||||
journal->j_cnode_free_orig = journal->j_cnode_free_list;
|
||||
journal->j_cnode_free = journal->j_cnode_free_list ? num_cnodes : 0;
|
||||
journal->j_cnode_used = 0;
|
||||
|
|
Loading…
Reference in a new issue