Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13af7574 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'reiserfs/kill-bkl' of... 

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
parents e20da891 bbec9191

fs/reiserfs/journal.c

+2 −0
Original line number Diff line number Diff line
@@ -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;