diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2024-09-04 12:15:38 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2024-09-04 12:15:38 +0200 |
| commit | eb876ea724835126f215c9a5bcc9e6148e2a6d15 (patch) | |
| tree | 689c215270b023c2f94a6629c7f1d3ef8e49c28a /include/linux/blkdev.h | |
| parent | 2dce993165088dbe728faa21547e3b74213b6732 (diff) | |
| parent | 67784a74e258a467225f0e68335df77acd67b7ab (diff) | |
Merge branch 'linus' into smp/core
Pull in upstream changes so further patches don't conflict.
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index e85ec73a07d5..b7664d593486 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1296,12 +1296,7 @@ bdev_max_secure_erase_sectors(struct block_device *bdev) static inline unsigned int bdev_write_zeroes_sectors(struct block_device *bdev) { - struct request_queue *q = bdev_get_queue(bdev); - - if (q) - return q->limits.max_write_zeroes_sectors; - - return 0; + return bdev_get_queue(bdev)->limits.max_write_zeroes_sectors; } static inline bool bdev_nonrot(struct block_device *bdev) |