diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-31 01:46:48 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-31 01:46:48 +0200 |
| commit | ec6a8679fa8ce977c8b7f86238455b494699de74 (patch) | |
| tree | d06401567f67cd757ddf358168bdf574cb4b94f5 /fs/btrfs/ctree.h | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy... (diff) | |
| parent | Btrfs: be more polite in the async caching threads (diff) | |
| download | linux-ec6a8679fa8ce977c8b7f86238455b494699de74.tar.xz linux-ec6a8679fa8ce977c8b7f86238455b494699de74.zip | |
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/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 215ef8cae823..837435ce84ca 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -825,6 +825,7 @@ struct btrfs_fs_info { struct mutex drop_mutex; struct mutex volume_mutex; struct mutex tree_reloc_mutex; + struct rw_semaphore extent_commit_sem; /* * this protects the ordered operations list only while we are @@ -959,9 +960,6 @@ struct btrfs_root { /* the node lock is held while changing the node pointer */ spinlock_t node_lock; - /* taken when updating the commit root */ - struct rw_semaphore commit_root_sem; - struct extent_buffer *commit_root; struct btrfs_root *log_root; struct btrfs_root *reloc_root; |