diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-07-10 22:43:57 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-07-10 22:43:57 -0700 |
| commit | 4049db73f1a32cd633827f479cb25fdcd231d7f4 (patch) | |
| tree | ae3c1d3eb12080b447d732ba37540bb9f87f3a48 /include/linux/blkdev.h | |
| parent | 62b5f32c45c31528c5228a44c59d150e8a786421 (diff) | |
| parent | e1496b74425e222e349b829e84415a380a59f178 (diff) | |
Merge "Merge android-4.4.139 (7ba5557) into msm-4.4"
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 9374470d9356..719428f16425 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -888,8 +888,8 @@ static inline unsigned int blk_max_size_offset(struct request_queue *q, if (!q->limits.chunk_sectors) return q->limits.max_sectors; - return q->limits.chunk_sectors - - (offset & (q->limits.chunk_sectors - 1)); + return min(q->limits.max_sectors, (unsigned int)(q->limits.chunk_sectors - + (offset & (q->limits.chunk_sectors - 1)))); } static inline unsigned int blk_rq_get_max_sectors(struct request *rq) |