diff options
| author | David S. Miller <davem@davemloft.net> | 2020-10-06 02:33:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-10-06 03:40:01 +0200 |
| commit | 8b0308fe319b8002753ea66f8f940fb393792ddd (patch) | |
| tree | 4c5a80346308db8cac9ff0951bb10e892c2387ad /drivers/block | |
| parent | net: phy: marvell: Use phy_read_paged() instead of open coding it (diff) | |
| parent | Merge tag 'platform-drivers-x86-v5.9-2' of git://git.infradead.org/linux-plat... (diff) | |
| download | linux-8b0308fe319b8002753ea66f8f940fb393792ddd.tar.xz linux-8b0308fe319b8002753ea66f8f940fb393792ddd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Rejecting non-native endian BTF overlapped with the addition
of support for it.
The rest were more simple overlapping changes, except the
renesas ravb binding update, which had to follow a file
move as well as a YAML conversion.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 04b6bde9419d..573dbf6f0c31 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -1553,7 +1553,7 @@ static int _drbd_send_page(struct drbd_peer_device *peer_device, struct page *pa * put_page(); and would cause either a VM_BUG directly, or * __page_cache_release a page that would actually still be referenced * by someone, leading to some obscure delayed Oops somewhere else. */ - if (drbd_disable_sendpage || (page_count(page) < 1) || PageSlab(page)) + if (drbd_disable_sendpage || !sendpage_ok(page)) return _drbd_no_send_page(peer_device, page, offset, size, msg_flags); msg_flags |= MSG_NOSIGNAL; |