aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ctree.h
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2011-07-16 15:23:14 -0400
committerChris Mason <chris.mason@oracle.com>2011-07-27 12:46:46 -0400
commitbd681513fa6f2ff29aa391f01e413a2d1c59fd77 (patch)
treebb10ec6ef876b4d7a553cbe54976ec49a0d10b21 /fs/btrfs/ctree.h
parent81317fdeddcef259b6ecf7b5c0d04caa167c6b54 (diff)
Btrfs: switch the btrfs tree locks to reader/writer
The btrfs metadata btree is the source of significant lock contention, especially in the root node. This commit changes our locking to use a reader/writer lock. The lock is built on top of rw spinlocks, and it extends the lock tracking to remember if we have a read lock or a write lock when we go to blocking. Atomics count the number of blocking readers or writers at any given time. It removes all of the adaptive spinning from the old code and uses only the spinning/blocking hints inside of btrfs to decide when it should continue spinning. In read heavy workloads this is dramatically faster. In write heavy workloads we're still faster because of less contention on the root node lock. We suffer slightly in dbench because we schedule more often during write locks, but all other benchmarks so far are improved. Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/ctree.h')
-rw-r--r--fs/btrfs/ctree.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 3063f21d3fc6..40235e10cfb9 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2333,7 +2333,7 @@ struct btrfs_path *btrfs_alloc_path(void);
2333void btrfs_free_path(struct btrfs_path *p); 2333void btrfs_free_path(struct btrfs_path *p);
2334void btrfs_set_path_blocking(struct btrfs_path *p); 2334void btrfs_set_path_blocking(struct btrfs_path *p);
2335void btrfs_clear_path_blocking(struct btrfs_path *p, 2335void btrfs_clear_path_blocking(struct btrfs_path *p,
2336 struct extent_buffer *held); 2336 struct extent_buffer *held, int held_rw);
2337void btrfs_unlock_up_safe(struct btrfs_path *p, int level); 2337void btrfs_unlock_up_safe(struct btrfs_path *p, int level);
2338 2338
2339int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root, 2339int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,