Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0956c798 authored by Andi Kleen's avatar Andi Kleen Committed by Chris Mason
Browse files

BTRFS: Remove unused node_lock 



240f62c8 replaced the node_lock with rcu_read_lock, but forgot
to remove the actual lock in the data structure. Remove it here.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 61c4f2c8

fs/btrfs/ctree.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -1088,9 +1088,6 @@ struct btrfs_fs_info { 
struct btrfs_root {

struct btrfs_root {

	struct extent_buffer *node;

	struct extent_buffer *node;





	/* the node lock is held while changing the node pointer */

	spinlock_t node_lock;



	struct extent_buffer *commit_root;

	struct extent_buffer *commit_root;

	struct btrfs_root *log_root;

	struct btrfs_root *log_root;

	struct btrfs_root *reloc_root;

	struct btrfs_root *reloc_root;

fs/btrfs/disk-io.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1064,7 +1064,6 @@ static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize, 
	INIT_LIST_HEAD(&root->dirty_list);

	INIT_LIST_HEAD(&root->dirty_list);

	INIT_LIST_HEAD(&root->orphan_list);

	INIT_LIST_HEAD(&root->orphan_list);

	INIT_LIST_HEAD(&root->root_list);

	INIT_LIST_HEAD(&root->root_list);

	spin_lock_init(&root->node_lock);

	spin_lock_init(&root->orphan_lock);

	spin_lock_init(&root->orphan_lock);

	spin_lock_init(&root->inode_lock);

	spin_lock_init(&root->inode_lock);

	spin_lock_init(&root->accounting_lock);

	spin_lock_init(&root->accounting_lock);