diff options
| author | Richard Weinberger <richard@nod.at> | 2020-10-11 22:07:52 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2020-10-11 22:07:52 +0200 |
| commit | 80510e25522949711410b37a7864f1b2d98215d8 (patch) | |
| tree | f3fb37900167a09da585169f68ceea7ee957f9d8 /net/ceph/osd_client.c | |
| parent | Merge tag 'nand/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mt... (diff) | |
| parent | Revert "mtd: spi-nor: Prefer asynchronous probe" (diff) | |
| download | linux-80510e25522949711410b37a7864f1b2d98215d8.tar.xz linux-80510e25522949711410b37a7864f1b2d98215d8.zip | |
Merge tag 'spi-nor/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next
SPI NOR core changes:
- Support for Winbond w25q64jwm flash
- Enable 4K sector support for mx25l12805d
SPI NOR controller drivers changes:
- intel-spi:
- Add Alder Lake-S PCI ID
Diffstat (limited to 'net/ceph/osd_client.c')
| -rw-r--r-- | net/ceph/osd_client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index e4fbcad6e7d8..7901ab6c79fd 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -3854,7 +3854,7 @@ static void scan_requests(struct ceph_osd *osd, if (!force_resend && !force_resend_writes) break; - /* fall through */ + fallthrough; case CALC_TARGET_NEED_RESEND: cancel_linger_map_check(lreq); /* @@ -3891,7 +3891,7 @@ static void scan_requests(struct ceph_osd *osd, !force_resend_writes)) break; - /* fall through */ + fallthrough; case CALC_TARGET_NEED_RESEND: cancel_map_check(req); unlink_request(osd, req); |