]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
block: blk_max_size_offset() should check ->max_sectors
authorJens Axboe <axboe@fb.com>
Wed, 18 Jun 2014 05:09:29 +0000 (22:09 -0700)
committerJens Axboe <axboe@fb.com>
Wed, 18 Jun 2014 05:12:02 +0000 (22:12 -0700)
Commit 762380ad9322 inadvertently changed a check for max_sectors
to max_hw_sectors. Revert that part, so we still compare against
max_sectors.

Signed-off-by: Jens Axboe <axboe@fb.com>
include/linux/blkdev.h

index 31e11051f1ba3b8c0b04170f7e235a01b9b420c9..713f8b62b435ea2cd2d273fc02c2b39520886d7d 100644 (file)
@@ -920,7 +920,7 @@ static inline unsigned int blk_max_size_offset(struct request_queue *q,
                                               sector_t offset)
 {
        if (!q->limits.chunk_sectors)
-               return q->limits.max_hw_sectors;
+               return q->limits.max_sectors;
 
        return q->limits.chunk_sectors -
                        (offset & (q->limits.chunk_sectors - 1));