diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-03-25 03:38:59 (GMT) |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-03-25 03:38:59 (GMT) |
| commit | 705cd0ea1cde2ce9225f1485c5a32c5841cacc5f (patch) | |
| tree | 72bc2c5eded0e04fc5e70ca2bd6df93a2e264112 /fs/btrfs/volumes.c | |
| parent | c8158819d506a8aedeca53c52dfb709a0aabe011 (diff) | |
| parent | 29ed7813ce5c4661261aeebddb1b8660e0860223 (diff) | |
| download | linux-fsl-qoriq-705cd0ea1cde2ce9225f1485c5a32c5841cacc5f.tar.xz | |
Merge branch 'for-jens' of http://evilpiepirate.org/git/linux-bcache into for-3.10/core
This contains Kents prep work for the immutable bio_vecs.
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 5989a92..d90e048 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5166,7 +5166,7 @@ static int bio_size_ok(struct block_device *bdev, struct bio *bio, } prev = &bio->bi_io_vec[bio->bi_vcnt - 1]; - if ((bio->bi_size >> 9) > max_sectors) + if (bio_sectors(bio) > max_sectors) return 0; if (!q->merge_bvec_fn) |