diff options
| author | Miao Xie <miaox@cn.fujitsu.com> | 2013-05-15 07:48:16 +0000 |
|---|---|---|
| committer | Josef Bacik <jbacik@fusionio.com> | 2013-05-17 21:40:30 -0400 |
| commit | e1409cef85894f96f4bddc6633d64d1c5275e2a3 (patch) | |
| tree | 712194a90f35e47e18f23b29cc630674befd5fc2 | |
| parent | 89042e5ad23d50449691141334f30d53d6271266 (diff) | |
| download | op-kernel-dev-e1409cef85894f96f4bddc6633d64d1c5275e2a3.zip op-kernel-dev-e1409cef85894f96f4bddc6633d64d1c5275e2a3.tar.gz | |
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>
| -rw-r--r-- | fs/btrfs/inode.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 790eceb..19eef3e 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4843,14 +4843,13 @@ static void inode_tree_add(struct inode *inode) struct rb_node **p; struct rb_node *parent; u64 ino = btrfs_ino(inode); -again: - p = &root->inode_tree.rb_node; - parent = NULL; if (inode_unhashed(inode)) return; - +again: + parent = NULL; spin_lock(&root->inode_lock); + p = &root->inode_tree.rb_node; while (*p) { parent = *p; entry = rb_entry(parent, struct btrfs_inode, rb_node); |
