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/transaction.h | |
| parent | btrfs: qgroup: Check if qgroup reserved space leaked (diff) | |
| parent | Btrfs: don't do extra bitmap search in one bit case (diff) | |
| download | linux-dev-a9e6d153563d2ed69c6cd7fb4fa5ce4ca7c712eb.tar.xz linux-dev-a9e6d153563d2ed69c6cd7fb4fa5ce4ca7c712eb.zip | |
Merge branch 'allocator-fixes' into for-linus-4.4
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/transaction.h')
| -rw-r--r-- | fs/btrfs/transaction.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h index 54b7dea74967..b05b2f64d913 100644 --- a/fs/btrfs/transaction.h +++ b/fs/btrfs/transaction.h @@ -32,6 +32,10 @@ enum btrfs_trans_state { TRANS_STATE_MAX = 6, }; +#define BTRFS_TRANS_HAVE_FREE_BGS 0 +#define BTRFS_TRANS_DIRTY_BG_RUN 1 +#define BTRFS_TRANS_CACHE_ENOSPC 2 + struct btrfs_transaction { u64 transid; /* @@ -46,11 +50,9 @@ struct btrfs_transaction { */ atomic_t num_writers; atomic_t use_count; + atomic_t pending_ordered; - /* - * true if there is free bgs operations in this transaction - */ - int have_free_bgs; + unsigned long flags; /* Be protected by fs_info->trans_lock when we want to change it. */ enum btrfs_trans_state state; @@ -59,9 +61,9 @@ struct btrfs_transaction { unsigned long start_time; wait_queue_head_t writer_wait; wait_queue_head_t commit_wait; + wait_queue_head_t pending_wait; struct list_head pending_snapshots; struct list_head pending_chunks; - struct list_head pending_ordered; struct list_head switch_commits; struct list_head dirty_bgs; struct list_head io_bgs; @@ -80,7 +82,6 @@ struct btrfs_transaction { spinlock_t dropped_roots_lock; struct btrfs_delayed_ref_root delayed_refs; int aborted; - int dirty_bg_run; }; #define __TRANS_FREEZABLE (1U << 0) @@ -128,7 +129,6 @@ struct btrfs_trans_handle { */ struct btrfs_root *root; struct seq_list delayed_ref_elem; - struct list_head ordered; struct list_head qgroup_ref_list; struct list_head new_bgs; }; |