diff options
| author | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:33 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:33 +0100 |
| commit | f004fae0cfeb96d33240eb5471f14cb6fbbd4eea (patch) | |
| tree | 8a0cc3be4e031298ef1f6db573c5f57da333737e /fs/btrfs/extent_io.h | |
| parent | 675d276b322b45e7bf7c616a2847bdc425745b99 (diff) | |
| parent | f827ba9a641b481f01d1bdc0771a7afc3776cc0b (diff) | |
| download | linux-0-day-f004fae0cfeb96d33240eb5471f14cb6fbbd4eea.tar.gz linux-0-day-f004fae0cfeb96d33240eb5471f14cb6fbbd4eea.tar.xz | |
Merge branch 'cleanups-4.6' into for-chris-4.6
Diffstat (limited to 'fs/btrfs/extent_io.h')
| -rw-r--r-- | fs/btrfs/extent_io.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index 880d5292e9721..5dbf92e68fbd1 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -61,6 +61,7 @@ struct extent_state; struct btrfs_root; struct btrfs_io_bio; +struct io_failure_record; typedef int (extent_submit_bio_hook_t)(struct inode *inode, int rw, struct bio *bio, int mirror_num, @@ -111,8 +112,7 @@ struct extent_state { atomic_t refs; unsigned state; - /* for use by the FS */ - u64 private; + struct io_failure_record *failrec; #ifdef CONFIG_BTRFS_DEBUG struct list_head leak_list; @@ -342,7 +342,6 @@ int extent_readpages(struct extent_io_tree *tree, get_extent_t get_extent); int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, __u64 start, __u64 len, get_extent_t *get_extent); -int get_state_private(struct extent_io_tree *tree, u64 start, u64 *private); void set_page_extent_mapped(struct page *page); struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, |