diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2012-03-03 07:41:15 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-03-03 07:41:15 -0500 |
| commit | d3b010640e5c59b98d3b11229ba4cc2838dc7cbf (patch) | |
| tree | adaa412e6603430b04e104dbafb4ed3e3d32a455 | |
| parent | e77266e4c4be6f9dc91bf688bce015a8babd5fe0 (diff) | |
btrfs: fix locking issues in find_parent_nodes()
- We might unlock head->mutex while it was not locked
- We might leave the function without unlocking delayed_refs->lock
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
| -rw-r--r-- | fs/btrfs/backref.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 98f6bf10bbd4..0436c12da8c2 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c | |||
| @@ -583,7 +583,7 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, | |||
| 583 | struct btrfs_path *path; | 583 | struct btrfs_path *path; |
| 584 | struct btrfs_key info_key = { 0 }; | 584 | struct btrfs_key info_key = { 0 }; |
| 585 | struct btrfs_delayed_ref_root *delayed_refs = NULL; | 585 | struct btrfs_delayed_ref_root *delayed_refs = NULL; |
| 586 | struct btrfs_delayed_ref_head *head = NULL; | 586 | struct btrfs_delayed_ref_head *head; |
| 587 | int info_level = 0; | 587 | int info_level = 0; |
| 588 | int ret; | 588 | int ret; |
| 589 | struct list_head prefs_delayed; | 589 | struct list_head prefs_delayed; |
| @@ -607,6 +607,8 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, | |||
| 607 | * at a specified point in time | 607 | * at a specified point in time |
| 608 | */ | 608 | */ |
| 609 | again: | 609 | again: |
| 610 | head = NULL; | ||
| 611 | |||
| 610 | ret = btrfs_search_slot(trans, fs_info->extent_root, &key, path, 0, 0); | 612 | ret = btrfs_search_slot(trans, fs_info->extent_root, &key, path, 0, 0); |
| 611 | if (ret < 0) | 613 | if (ret < 0) |
| 612 | goto out; | 614 | goto out; |
| @@ -635,8 +637,10 @@ again: | |||
| 635 | goto again; | 637 | goto again; |
| 636 | } | 638 | } |
| 637 | ret = __add_delayed_refs(head, seq, &info_key, &prefs_delayed); | 639 | ret = __add_delayed_refs(head, seq, &info_key, &prefs_delayed); |
| 638 | if (ret) | 640 | if (ret) { |
| 641 | spin_unlock(&delayed_refs->lock); | ||
| 639 | goto out; | 642 | goto out; |
| 643 | } | ||
| 640 | } | 644 | } |
| 641 | spin_unlock(&delayed_refs->lock); | 645 | spin_unlock(&delayed_refs->lock); |
| 642 | 646 | ||
