diff options
| author | Chris Mason <chris.mason@fusionio.com> | 2013-02-20 14:06:05 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-02-20 14:06:05 -0500 |
| commit | e942f883bc6651d50be139477baf6fb0eed3d5bb (patch) | |
| tree | e1d19783e9c8b42198a69c17c9719fb90f302847 /fs/btrfs/delayed-ref.h | |
| parent | b2c6b3e0611c58fbeb6b9c0892b6249f7bdfaf6b (diff) | |
| parent | 0e4e02636611dbf89a2f36320a32054f9936d6cb (diff) | |
| download | linux-0-day-e942f883bc6651d50be139477baf6fb0eed3d5bb.tar.gz linux-0-day-e942f883bc6651d50be139477baf6fb0eed3d5bb.tar.xz | |
Merge branch 'raid56-experimental' into for-linus-3.9
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Conflicts:
fs/btrfs/ctree.h
fs/btrfs/extent-tree.c
fs/btrfs/inode.c
fs/btrfs/volumes.c
Diffstat (limited to 'fs/btrfs/delayed-ref.h')
| -rw-r--r-- | fs/btrfs/delayed-ref.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h index 7939149f8f274..f75fcaf79aebd 100644 --- a/fs/btrfs/delayed-ref.h +++ b/fs/btrfs/delayed-ref.h @@ -132,6 +132,15 @@ struct btrfs_delayed_ref_root { unsigned long num_heads_ready; /* + * bumped when someone is making progress on the delayed + * refs, so that other procs know they are just adding to + * contention intead of helping + */ + atomic_t procs_running_refs; + atomic_t ref_seq; + wait_queue_head_t wait; + + /* * set when the tree is flushing before a transaction commit, * used by the throttling code to decide if new updates need * to be run right away |