diff options
| author |   Chris Mason <clm@fb.com> | 2015-10-21 19:00:38 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-10-21 19:00:38 -0700 |
| commit | a9e6d153563d2ed69c6cd7fb4fa5ce4ca7c712eb (patch) | |
| tree | 43fab2a259934e1f1dde9607610424d6089dba5e /fs/btrfs/disk-io.c | |
| parent | btrfs: qgroup: Check if qgroup reserved space leaked (diff) | |
| parent | Btrfs: don't do extra bitmap search in one bit case (diff) | |
| download | wireguard-linux-a9e6d153563d2ed69c6cd7fb4fa5ce4ca7c712eb.tar.xz wireguard-linux-a9e6d153563d2ed69c6cd7fb4fa5ce4ca7c712eb.zip | |
Merge branch 'allocator-fixes' into for-linus-4.4
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 0e0544e0e20b..86a11a902fcf 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -4327,25 +4327,6 @@ again: return 0; } -static void btrfs_free_pending_ordered(struct btrfs_transaction *cur_trans, - struct btrfs_fs_info *fs_info) -{ - struct btrfs_ordered_extent *ordered; - - spin_lock(&fs_info->trans_lock); - while (!list_empty(&cur_trans->pending_ordered)) { - ordered = list_first_entry(&cur_trans->pending_ordered, - struct btrfs_ordered_extent, - trans_list); - list_del_init(&ordered->trans_list); - spin_unlock(&fs_info->trans_lock); - - btrfs_put_ordered_extent(ordered); - spin_lock(&fs_info->trans_lock); - } - spin_unlock(&fs_info->trans_lock); -} - void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans, struct btrfs_root *root) { @@ -4357,7 +4338,6 @@ void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans, cur_trans->state = TRANS_STATE_UNBLOCKED; wake_up(&root->fs_info->transaction_wait); - btrfs_free_pending_ordered(cur_trans, root->fs_info); btrfs_destroy_delayed_inodes(root); btrfs_assert_delayed_root_empty(root); |