| commit | 239b14b32dc39232ebf9cce29ff77c4c564355fd | [log] [tgz] |
|---|---|---|
| author | Chris Mason <chris.mason@oracle.com> | Mon Mar 24 15:02:07 2008 -0400 |
| committer | Chris Mason <chris.mason@oracle.com> | Thu Sep 25 11:04:01 2008 -0400 |
| tree | f7a95d97d71ef9d0f355a71a83e2ba1f62944e04 | |
| parent | 0d81ba5dbedef0c3970d6aa318aa84920943e6e3 [diff] [blame] |
Btrfs: Bring back mount -o ssd optimizations Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 26185d4..4890151 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c
@@ -1103,4 +1103,6 @@ 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, };