diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-01 04:26:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-01 04:26:43 -0500 |
| commit | 7e4d960993331e92567f0180e45322a93e6780ba (patch) | |
| tree | 4d7444035303fc0b545e88afbd894176344fb2a3 /fs/btrfs/ctree.h | |
| parent | de5bdff7a72acc281219be2b8edeeca1fd81c542 (diff) | |
| parent | 164974a8f2a482f1abcb027c6d1a89dd79b14297 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: we'll queue up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 27ebe61d3ccc..80b6486fd5e6 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
| @@ -886,7 +886,7 @@ struct btrfs_block_rsv { | |||
| 886 | u64 reserved; | 886 | u64 reserved; |
| 887 | struct btrfs_space_info *space_info; | 887 | struct btrfs_space_info *space_info; |
| 888 | spinlock_t lock; | 888 | spinlock_t lock; |
| 889 | unsigned int full:1; | 889 | unsigned int full; |
| 890 | }; | 890 | }; |
| 891 | 891 | ||
| 892 | /* | 892 | /* |