summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/extent_io.h
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2008-03-24 20:02:07 +0100
committerChris Mason <chris.mason@oracle.com>2008-09-25 17:04:01 +0200
commit239b14b32dc39232ebf9cce29ff77c4c564355fd (patch)
treef7a95d97d71ef9d0f355a71a83e2ba1f62944e04 /fs/btrfs/extent_io.h
parentBtrfs: Move device information into the super block so it can be scanned (diff)
downloadlinux-239b14b32dc39232ebf9cce29ff77c4c564355fd.tar.xz
linux-239b14b32dc39232ebf9cce29ff77c4c564355fd.zip
Btrfs: Bring back mount -o ssd optimizations
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/extent_io.h')
-rw-r--r--fs/btrfs/extent_io.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 0dca89328f98..8b5319db2516 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -29,6 +29,8 @@ struct extent_io_ops {
int (*fill_delalloc)(struct inode *inode, u64 start, u64 end);
int (*writepage_io_hook)(struct page *page, u64 start, u64 end);
int (*submit_bio_hook)(struct inode *inode, int rw, struct bio *bio);
+ int (*merge_bio_hook)(struct page *page, unsigned long offset,
+ size_t size, struct bio *bio);
int (*readpage_io_hook)(struct page *page, u64 start, u64 end);
int (*readpage_end_io_hook)(struct page *page, u64 start, u64 end,
struct extent_state *state);