mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-01-03 10:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always initialize btree lockdep class

Browse Source 
We have to set the lock class to the btree level to keep
lockdep from building long depdencency chains.  We initialized
allocated blocks for tree growth but not for splitting.  We fix this by
moving the init up into allocation instead of in tree growth.  Now all
the places we get blocks from the block calls are set.

This silences a lockdep warning during merge during rm -rf which is the
first place where multiple blocks in a level are locked.

Signed-off-by: Zach Brown <zab@versity.com>
Reviewed-by: Mark Fasheh <mfasheh@versity.com>
This commit is contained in:
Zach Brown
2016-11-04 14:32:22 -07:00
parent 6fd5396fbe
commit f54f61f064
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kmod/src/btree.c
View File

@@ -512,7 +512,7 @@ static void unlock_tree_block(struct super_block *sb,
* Allocate and initialize a new tree block. The caller adds references
* to it.
*/
static struct scoutfs_block *alloc_tree_block(struct super_block *sb)
static struct scoutfs_block *alloc_tree_block(struct super_block *sb, int level)
{
struct scoutfs_btree_block *bt;
struct scoutfs_block *bl;
@@ -524,6 +524,8 @@ static struct scoutfs_block *alloc_tree_block(struct super_block *sb)
bt->free_end = cpu_to_le16(SCOUTFS_BLOCK_SIZE);
bt->free_reclaim = 0;
bt->nr_items = 0;
set_block_lock_class(bl, level);
}
return bl;
@@ -555,7 +557,7 @@ static struct scoutfs_block *grow_tree(struct super_block *sb,
struct scoutfs_block_header *hdr;
struct scoutfs_block *bl;
bl = alloc_tree_block(sb);
bl = alloc_tree_block(sb, root->height);
if (!IS_ERR(bl)) {
hdr = scoutfs_block_data(bl);
@@ -652,7 +654,7 @@ static struct scoutfs_block *try_split(struct super_block *sb,
}
/* alloc split neighbour first to avoid unwinding tree growth */
left_bl = alloc_tree_block(sb);
left_bl = alloc_tree_block(sb, level);
if (IS_ERR(left_bl)) {
unlock_tree_block(sb, root, right_bl, true);
scoutfs_block_put(right_bl);