Merge branch 'cleanups-4.7' into for-chris-4.7-20160525

This commit is contained in:
David Sterba
2016-05-25 22:51:03 +02:00
36 changed files with 193 additions and 196 deletions

View File

@@ -58,7 +58,7 @@ struct btrfs_ordered_sum {
#define BTRFS_ORDERED_COMPRESSED 3 /* writing a zlib compressed extent */
#define BTRFS_ORDERED_PREALLOC 4 /* set when writing to prealloced extent */
#define BTRFS_ORDERED_PREALLOC 4 /* set when writing to preallocated extent */
#define BTRFS_ORDERED_DIRECT 5 /* set when we're doing DIO with this extent */