diff options
| author |   Chris Mason <chris.mason@fusionio.com> | 2013-02-20 14:05:45 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-02-20 14:05:45 -0500 |
| commit | b2c6b3e0611c58fbeb6b9c0892b6249f7bdfaf6b (patch) | |
| tree | de7cf0825605aa6acf33a8d107003efd7aedbe72 /fs/btrfs/extent_io.h | |
| parent | Linux 3.8 (diff) | |
| parent | Btrfs: fix missing release of qgroup reservation in commit_transaction() (diff) | |
| download | linux-dev-b2c6b3e0611c58fbeb6b9c0892b6249f7bdfaf6b.tar.xz linux-dev-b2c6b3e0611c58fbeb6b9c0892b6249f7bdfaf6b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into for-linus-3.9
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Conflicts:
fs/btrfs/disk-io.c
Diffstat (limited to 'fs/btrfs/extent_io.h')
| -rw-r--r-- | fs/btrfs/extent_io.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index 2eacfabd3263..ff182322d112 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -75,7 +75,6 @@ struct extent_io_ops { int (*merge_bio_hook)(struct page *page, unsigned long offset, size_t size, struct bio *bio, unsigned long bio_flags); - int (*readpage_io_hook)(struct page *page, u64 start, u64 end); int (*readpage_io_failed_hook)(struct page *page, int failed_mirror); int (*readpage_end_io_hook)(struct page *page, u64 start, u64 end, struct extent_state *state, int mirror); @@ -90,8 +89,6 @@ struct extent_io_ops { struct extent_state *other); void (*split_extent_hook)(struct inode *inode, struct extent_state *orig, u64 split); - int (*write_cache_pages_lock_hook)(struct page *page, void *data, - void (*flush_fn)(void *)); }; struct extent_io_tree { |