diff options
| author | Chris Mason <chris.mason@oracle.com> | 2008-03-24 20:02:07 +0100 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 17:04:01 +0200 |
| commit | 239b14b32dc39232ebf9cce29ff77c4c564355fd (patch) | |
| tree | f7a95d97d71ef9d0f355a71a83e2ba1f62944e04 /fs/btrfs/extent_io.c | |
| parent | Btrfs: Move device information into the super block so it can be scanned (diff) | |
| download | linux-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.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 7e3a1ebde9fc..6dab664529c1 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -1730,6 +1730,8 @@ static int submit_extent_page(int rw, struct extent_io_tree *tree, if (bio_ret && *bio_ret) { bio = *bio_ret; if (bio->bi_sector + (bio->bi_size >> 9) != sector || + (tree->ops && tree->ops->merge_bio_hook && + tree->ops->merge_bio_hook(page, offset, size, bio)) || bio_add_page(bio, page, size, offset) < size) { ret = submit_one_bio(rw, bio); bio = NULL; |