Selaa lähdekoodia

Btrfs: fix unprotected root node of the subvolume's inode rb-tree

The root node of the rb-tree may be changed, so we should get it under
the lock. Fix it.

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Miao Xie 12 vuotta sitten
vanhempi
commit
e1409cef85
1 muutettua tiedostoa jossa 3 lisäystä ja 4 poistoa
  1. 3 4
      fs/btrfs/inode.c

+ 3 - 4
fs/btrfs/inode.c

@@ -4843,14 +4843,13 @@ static void inode_tree_add(struct inode *inode)
 	struct rb_node **p;
 	struct rb_node **p;
 	struct rb_node *parent;
 	struct rb_node *parent;
 	u64 ino = btrfs_ino(inode);
 	u64 ino = btrfs_ino(inode);
-again:
-	p = &root->inode_tree.rb_node;
-	parent = NULL;
 
 
 	if (inode_unhashed(inode))
 	if (inode_unhashed(inode))
 		return;
 		return;
-
+again:
+	parent = NULL;
 	spin_lock(&root->inode_lock);
 	spin_lock(&root->inode_lock);
+	p = &root->inode_tree.rb_node;
 	while (*p) {
 	while (*p) {
 		parent = *p;
 		parent = *p;
 		entry = rb_entry(parent, struct btrfs_inode, rb_node);
 		entry = rb_entry(parent, struct btrfs_inode, rb_node);