diff options
| author | Chris Mason | 2008-03-24 20:02:07 +0100 |
|---|---|---|
| committer | Chris Mason | 2008-09-25 17:04:01 +0200 |
| commit | 239b14b32dc39232ebf9cce29ff77c4c564355fd (patch) | |
| tree | f7a95d97d71ef9d0f355a71a83e2ba1f62944e04 /fs/btrfs/disk-io.c | |
| parent | Btrfs: Move device information into the super block so it can be scanned (diff) | |
| download | kernel-qcow2-linux-239b14b32dc39232ebf9cce29ff77c4c564355fd.tar.gz kernel-qcow2-linux-239b14b32dc39232ebf9cce29ff77c4c564355fd.tar.xz kernel-qcow2-linux-239b14b32dc39232ebf9cce29ff77c4c564355fd.zip | |
Btrfs: Bring back mount -o ssd optimizations
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 26185d46712c..4890151cd68d 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1103,4 +1103,6 @@ int btrfs_read_buffer(struct extent_buffer *buf) static struct extent_io_ops btree_extent_io_ops = { .writepage_io_hook = btree_writepage_io_hook, .submit_bio_hook = btree_submit_bio_hook, + /* note we're sharing with inode.c for the merge bio hook */ + .merge_bio_hook = btrfs_merge_bio_hook, }; |