Fix btrfs_get_extent and get_block corner cases, and disable O_DIRECT reads

[deliverable/linux.git] / fs / btrfs / volumes.c

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 5619e50583e3bfc9222a0720d58edba7f97d1433..bccb5566fd84b8365d50906d0d7a8d639c95ae40 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1161,7 +1161,6 @@ int btrfs_map_bio(struct btrfs_root *root, int rw, struct bio *bio,
        int total_devs = 1;
 
        length = bio->bi_size;
-
        map_tree = &root->fs_info->mapping_tree;
        map_length = length;
 
@@ -1192,6 +1191,7 @@ int btrfs_map_bio(struct btrfs_root *root, int rw, struct bio *bio,
                }
                bio->bi_sector = multi->stripes[dev_nr].physical >> 9;
                dev = multi->stripes[dev_nr].dev;
+
                bio->bi_bdev = dev->bdev;
                spin_lock(&dev->io_lock);
                dev->total_ios++;