diff options
| author | Chris Mason <clm@fb.com> | 2015-08-09 16:35:33 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-08-09 16:35:33 +0200 |
| commit | 46cd28555ffaa40162290dba203daad0ff6f7abd (patch) | |
| tree | a10fd81b6c7ff5ea7642b1e2462e529971e8713a /fs/btrfs/transaction.c | |
| parent | Btrfs: add support for blkio controllers (diff) | |
| parent | btrfs: add missing discards when unpinning extents with -o discard (diff) | |
| download | linux-46cd28555ffaa40162290dba203daad0ff6f7abd.tar.xz linux-46cd28555ffaa40162290dba203daad0ff6f7abd.zip | |
Merge branch 'jeffm-discard-4.3' into for-linus-4.3
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 91f44c9f7ebc..20267d47dbcd 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -258,6 +258,8 @@ loop: mutex_init(&cur_trans->cache_write_mutex); cur_trans->num_dirty_bgs = 0; spin_lock_init(&cur_trans->dirty_bgs_lock); + INIT_LIST_HEAD(&cur_trans->deleted_bgs); + spin_lock_init(&cur_trans->deleted_bgs_lock); list_add_tail(&cur_trans->list, &fs_info->trans_list); extent_io_tree_init(&cur_trans->dirty_pages, fs_info->btree_inode->i_mapping); |