diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-14 10:08:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-14 10:08:57 +0200 |
| commit | 9ef8638bd8c7e06bee087a04af7950cbc6123828 (patch) | |
| tree | de145994dfe036dbd2d729c61e043f1a96cef25c /block/blk-wbt.c | |
| parent | platform_device: switch to simpler IDA interface (diff) | |
| parent | Linux 5.9-rc5 (diff) | |
| download | linux-9ef8638bd8c7e06bee087a04af7950cbc6123828.tar.xz linux-9ef8638bd8c7e06bee087a04af7950cbc6123828.zip | |
Merge 5.9-rc5 into driver-core-next
We need the driver core changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block/blk-wbt.c')
| -rw-r--r-- | block/blk-wbt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-wbt.c b/block/blk-wbt.c index 0fa615eefd52..fd410086fe1d 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -528,7 +528,7 @@ static inline bool wbt_should_throttle(struct rq_wb *rwb, struct bio *bio) if ((bio->bi_opf & (REQ_SYNC | REQ_IDLE)) == (REQ_SYNC | REQ_IDLE)) return false; - /* fallthrough */ + fallthrough; case REQ_OP_DISCARD: return true; default: |