diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-01 13:46:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-01 13:46:18 -0500 |
| commit | 13af75740f345a5ddb5f7020a688c0f96b0d9f1f (patch) | |
| tree | e69606e57ab64979d02a165dd36e4abba79d32e0 | |
| parent | e20da891302c69d49fea181b4e49c33acc2305de (diff) | |
| parent | bbec919150037b8a2e58e32d3ba642ba3b6582a5 (diff) | |
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
| -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 83ac4d3b3cb0..ba98546fabbd 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
| @@ -2913,7 +2913,9 @@ int journal_init(struct super_block *sb, const char *j_dev_name, | |||
| 2913 | journal->j_mount_id = 10; | 2913 | journal->j_mount_id = 10; |
| 2914 | journal->j_state = 0; | 2914 | journal->j_state = 0; |
| 2915 | atomic_set(&(journal->j_jlock), 0); | 2915 | atomic_set(&(journal->j_jlock), 0); |
| 2916 | reiserfs_write_unlock(sb); | ||
| 2916 | journal->j_cnode_free_list = allocate_cnodes(num_cnodes); | 2917 | journal->j_cnode_free_list = allocate_cnodes(num_cnodes); |
| 2918 | reiserfs_write_lock(sb); | ||
| 2917 | journal->j_cnode_free_orig = journal->j_cnode_free_list; | 2919 | journal->j_cnode_free_orig = journal->j_cnode_free_list; |
| 2918 | journal->j_cnode_free = journal->j_cnode_free_list ? num_cnodes : 0; | 2920 | journal->j_cnode_free = journal->j_cnode_free_list ? num_cnodes : 0; |
| 2919 | journal->j_cnode_used = 0; | 2921 | journal->j_cnode_used = 0; |