diff options
| author | Chris Mason <clm@fb.com> | 2016-01-19 18:21:00 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-01-19 18:21:00 -0800 |
| commit | acc308556c812485462b6b43843c3f64530dd843 (patch) | |
| tree | fa26745572077d32d446e5fc444eb253812577d1 /fs/btrfs/extent_map.h | |
| parent | 988f1f576d4f7531cb2175ee1b7cb7afd6d95d22 (diff) | |
| parent | fb75d857a31d600cc0c37b8c7d914014f7fa3f9a (diff) | |
| download | blackbird-op-linux-acc308556c812485462b6b43843c3f64530dd843.tar.gz blackbird-op-linux-acc308556c812485462b6b43843c3f64530dd843.zip | |
Merge branch 'misc-cleanups-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.5
Diffstat (limited to 'fs/btrfs/extent_map.h')
| -rw-r--r-- | fs/btrfs/extent_map.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/btrfs/extent_map.h b/fs/btrfs/extent_map.h index b2991fd8583e..eb8b8fae036b 100644 --- a/fs/btrfs/extent_map.h +++ b/fs/btrfs/extent_map.h @@ -32,7 +32,15 @@ struct extent_map { u64 block_len; u64 generation; unsigned long flags; - struct block_device *bdev; + union { + struct block_device *bdev; + + /* + * used for chunk mappings + * flags & EXTENT_FLAG_FS_MAPPING must be set + */ + struct map_lookup *map_lookup; + }; atomic_t refs; unsigned int compress_type; struct list_head list; |
