diff options
| author | Chris Mason <clm@fb.com> | 2017-04-27 23:13:09 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2017-04-27 23:13:09 +0200 |
| commit | bce19f9d232b71c4eef9ca7d0947035bbb922cef (patch) | |
| tree | 58a8041a2964a0d9ae190d95828db54737220b2c /fs/btrfs/extent_io.h | |
| parent | btrfs: check if the device is flush capable (diff) | |
| parent | Btrfs: fix reported number of inode blocks (diff) | |
| download | linux-bce19f9d232b71c4eef9ca7d0947035bbb922cef.tar.xz linux-bce19f9d232b71c4eef9ca7d0947035bbb922cef.zip | |
Merge branch 'for-chris-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.12
Diffstat (limited to 'fs/btrfs/extent_io.h')
| -rw-r--r-- | fs/btrfs/extent_io.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index 8d2d6e4272d5..1eafa2f0ede3 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -15,14 +15,17 @@ #define EXTENT_DEFRAG (1U << 6) #define EXTENT_BOUNDARY (1U << 9) #define EXTENT_NODATASUM (1U << 10) -#define EXTENT_DO_ACCOUNTING (1U << 11) +#define EXTENT_CLEAR_META_RESV (1U << 11) #define EXTENT_FIRST_DELALLOC (1U << 12) #define EXTENT_NEED_WAIT (1U << 13) #define EXTENT_DAMAGED (1U << 14) #define EXTENT_NORESERVE (1U << 15) #define EXTENT_QGROUP_RESERVED (1U << 16) #define EXTENT_CLEAR_DATA_RESV (1U << 17) +#define EXTENT_DELALLOC_NEW (1U << 18) #define EXTENT_IOBITS (EXTENT_LOCKED | EXTENT_WRITEBACK) +#define EXTENT_DO_ACCOUNTING (EXTENT_CLEAR_META_RESV | \ + EXTENT_CLEAR_DATA_RESV) #define EXTENT_CTLBITS (EXTENT_DO_ACCOUNTING | EXTENT_FIRST_DELALLOC) /* |