diff options
author | Miao Xie <miaox@cn.fujitsu.com> | 2012-06-14 04:23:22 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@fusionio.com> | 2012-06-15 11:42:28 -0400 |
commit | 67cde3448d951b55088a6ea3bb1aee0160068fb9 (patch) | |
tree | 762aa0d1a09f8ea58f7a861b32b67c71ae5a8df1 /fs/btrfs/disk-io.c | |
parent | ed0eaa14981e87a1e185b61e4ef621c440e3930c (diff) |
Btrfs: destroy the items of the delayed inodes in error handling routine
the items of the delayed inodes were forgotten to be freed, this patch
fixes it.
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r-- | fs/btrfs/disk-io.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index ffdd76bf05d4..e22c5bbf0223 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -3608,6 +3608,9 @@ void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans, | |||
3608 | cur_trans->commit_done = 1; | 3608 | cur_trans->commit_done = 1; |
3609 | wake_up(&cur_trans->commit_wait); | 3609 | wake_up(&cur_trans->commit_wait); |
3610 | 3610 | ||
3611 | btrfs_destroy_delayed_inodes(root); | ||
3612 | btrfs_assert_delayed_root_empty(root); | ||
3613 | |||
3611 | btrfs_destroy_pending_snapshots(cur_trans); | 3614 | btrfs_destroy_pending_snapshots(cur_trans); |
3612 | 3615 | ||
3613 | btrfs_destroy_marked_extents(root, &cur_trans->dirty_pages, | 3616 | btrfs_destroy_marked_extents(root, &cur_trans->dirty_pages, |
@@ -3662,6 +3665,9 @@ int btrfs_cleanup_transaction(struct btrfs_root *root) | |||
3662 | if (waitqueue_active(&t->commit_wait)) | 3665 | if (waitqueue_active(&t->commit_wait)) |
3663 | wake_up(&t->commit_wait); | 3666 | wake_up(&t->commit_wait); |
3664 | 3667 | ||
3668 | btrfs_destroy_delayed_inodes(root); | ||
3669 | btrfs_assert_delayed_root_empty(root); | ||
3670 | |||
3665 | btrfs_destroy_pending_snapshots(t); | 3671 | btrfs_destroy_pending_snapshots(t); |
3666 | 3672 | ||
3667 | btrfs_destroy_delalloc_inodes(root); | 3673 | btrfs_destroy_delalloc_inodes(root); |