Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drbd: code cleanup by using sendpage_ok() to check page for kernel_sendpage()

In _drbd_send_page() a page is checked by following code before sending
it by kernel_sendpage(),
(page_count(page) < 1) || PageSlab(page)
If the check is true, this page won't be send by kernel_sendpage() and
handled by sock_no_sendpage().

This kind of check is exactly what macro sendpage_ok() does, which is
introduced into include/linux/net.h to solve a similar send page issue
in nvme-tcp code.

This patch uses macro sendpage_ok() to replace the open coded checks to
page type and refcount in _drbd_send_page(), as a code cleanup.

Signed-off-by: Coly Li <colyli@suse.de>
Cc: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Coly Li and committed by
David S. Miller
fb25ebe1 cf83a17e

+1 -1
+1 -1
drivers/block/drbd/drbd_main.c
··· 1553 1553 * put_page(); and would cause either a VM_BUG directly, or 1554 1554 * __page_cache_release a page that would actually still be referenced 1555 1555 * by someone, leading to some obscure delayed Oops somewhere else. */ 1556 - if (drbd_disable_sendpage || (page_count(page) < 1) || PageSlab(page)) 1556 + if (drbd_disable_sendpage || !sendpage_ok(page)) 1557 1557 return _drbd_no_send_page(peer_device, page, offset, size, msg_flags); 1558 1558 1559 1559 msg_flags |= MSG_NOSIGNAL;