diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-05 10:51:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-05 10:51:25 -0800 |
| commit | 8762340561397fce0f0b41220ed9619101c870d0 (patch) | |
| tree | cdcc92c440b798d5f0e3fe4619d79e018b6cd464 | |
| parent | b3298500b23f0b53a8d81e0d5ad98a29db71f4f0 (diff) | |
| parent | 65f33b35722952fa076811d5686bfd8a611a80fa (diff) | |
| download | linux-8762340561397fce0f0b41220ed9619101c870d0.tar.bz2 | |
Merge tag 'for-5.10/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
Pull fix for device mapper fixes from Mike Snitzer:
"Apologies for the glaring bug I introduced with my previous pull
request!
Fix incorrect branching at top of blk_max_size_offset()"
* tag 'for-5.10/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
block: fix incorrect branching in blk_max_size_offset()
| -rw-r--r-- | include/linux/blkdev.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 24ae504cf77d..033eb5f73b65 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1076,10 +1076,12 @@ static inline unsigned int blk_max_size_offset(struct request_queue *q, sector_t offset, unsigned int chunk_sectors) { - if (!chunk_sectors && q->limits.chunk_sectors) - chunk_sectors = q->limits.chunk_sectors; - else - return q->limits.max_sectors; + if (!chunk_sectors) { + if (q->limits.chunk_sectors) + chunk_sectors = q->limits.chunk_sectors; + else + return q->limits.max_sectors; + } if (likely(is_power_of_2(chunk_sectors))) chunk_sectors -= offset & (chunk_sectors - 1); |