diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-30 16:46:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-30 16:46:48 -0700 |
| commit | ec6a8679fa8ce977c8b7f86238455b494699de74 (patch) | |
| tree | d06401567f67cd757ddf358168bdf574cb4b94f5 /fs/btrfs/disk-io.c | |
| parent | db06816cb9ceb21a2bf24122407b7b4fe419c3fc (diff) | |
| parent | f36f3042eae238bdaefe7c79310afe573bfc3622 (diff) | |
| download | op-kernel-dev-ec6a8679fa8ce977c8b7f86238455b494699de74.zip op-kernel-dev-ec6a8679fa8ce977c8b7f86238455b494699de74.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: be more polite in the async caching threads
Btrfs: preserve commit_root for async caching
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 7dcaa81..e83be2e 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -909,7 +909,6 @@ static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize, spin_lock_init(&root->inode_lock); mutex_init(&root->objectid_mutex); mutex_init(&root->log_mutex); - init_rwsem(&root->commit_root_sem); init_waitqueue_head(&root->log_writer_wait); init_waitqueue_head(&root->log_commit_wait[0]); init_waitqueue_head(&root->log_commit_wait[1]); @@ -1640,6 +1639,7 @@ struct btrfs_root *open_ctree(struct super_block *sb, mutex_init(&fs_info->cleaner_mutex); mutex_init(&fs_info->volume_mutex); mutex_init(&fs_info->tree_reloc_mutex); + init_rwsem(&fs_info->extent_commit_sem); btrfs_init_free_cluster(&fs_info->meta_alloc_cluster); btrfs_init_free_cluster(&fs_info->data_alloc_cluster); |
