diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-07-31 10:23:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-31 10:23:35 +0200 |
| commit | 5b929bd11df23922daf1be5d52731cc3900c1d79 (patch) | |
| tree | 105fa5987b03c9f4e0260a9eb04dff7bb3d16839 /fs/btrfs/ctree.h | |
| parent | b2c51106c7581866c37ffc77c5d739f3d4b7cbc9 (diff) | |
| parent | 37868fe113ff2ba814b3b4eb12df214df555f8dc (diff) | |
Merge branch 'x86/urgent' into x86/asm, before applying dependent patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 80a9aefb0c46..aac314e14188 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1778,6 +1778,7 @@ struct btrfs_fs_info { spinlock_t unused_bgs_lock; struct list_head unused_bgs; struct mutex unused_bg_unpin_mutex; + struct mutex delete_unused_bgs_mutex; /* For btrfs to record security options */ struct security_mnt_opts security_opts; |