diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-01 10:46:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-01 10:46:18 -0800 |
| commit | 13af75740f345a5ddb5f7020a688c0f96b0d9f1f (patch) | |
| tree | e69606e57ab64979d02a165dd36e4abba79d32e0 /fs | |
| parent | Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | reiserfs: Fix vmalloc call under reiserfs lock (diff) | |
| download | linux-dev-13af75740f345a5ddb5f7020a688c0f96b0d9f1f.tar.xz linux-dev-13af75740f345a5ddb5f7020a688c0f96b0d9f1f.zip | |
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
Diffstat (limited to 'fs')
| -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, 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; |