diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/ctree.h | 3 | ||||
-rw-r--r-- | fs/btrfs/disk-io.c | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 8f4b81de3ae2..f290b98e2fe6 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -1088,9 +1088,6 @@ struct btrfs_fs_info { | |||
1088 | struct btrfs_root { | 1088 | struct btrfs_root { |
1089 | struct extent_buffer *node; | 1089 | struct extent_buffer *node; |
1090 | 1090 | ||
1091 | /* the node lock is held while changing the node pointer */ | ||
1092 | spinlock_t node_lock; | ||
1093 | |||
1094 | struct extent_buffer *commit_root; | 1091 | struct extent_buffer *commit_root; |
1095 | struct btrfs_root *log_root; | 1092 | struct btrfs_root *log_root; |
1096 | struct btrfs_root *reloc_root; | 1093 | struct btrfs_root *reloc_root; |
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 228cf36ece83..64b289690f9d 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -1064,7 +1064,6 @@ static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize, | |||
1064 | INIT_LIST_HEAD(&root->dirty_list); | 1064 | INIT_LIST_HEAD(&root->dirty_list); |
1065 | INIT_LIST_HEAD(&root->orphan_list); | 1065 | INIT_LIST_HEAD(&root->orphan_list); |
1066 | INIT_LIST_HEAD(&root->root_list); | 1066 | INIT_LIST_HEAD(&root->root_list); |
1067 | spin_lock_init(&root->node_lock); | ||
1068 | spin_lock_init(&root->orphan_lock); | 1067 | spin_lock_init(&root->orphan_lock); |
1069 | spin_lock_init(&root->inode_lock); | 1068 | spin_lock_init(&root->inode_lock); |
1070 | spin_lock_init(&root->accounting_lock); | 1069 | spin_lock_init(&root->accounting_lock); |