diff mbox series

block: fix build failure in case of !CONFIG_BLOCK

Message ID 20200514014302.2078182-1-ming.lei@redhat.com (mailing list archive)
State New, archived
Headers show
Series block: fix build failure in case of !CONFIG_BLOCK | expand

Commit Message

Ming Lei May 14, 2020, 1:43 a.m. UTC
Commit e6249cdd46e4 ("block: add blk_io_schedule() for avoiding task hung
in sync dio") adds helper blk_io_schedule, however the required header
is added for CONFIG_BLOCK only.

Fixes the issue by moving the added '#include' out of CONFIG_BLOCK
because blk_io_schedule() doesn't need any CONFIG_BLOCK only stuff.

Fixes: e6249cdd46e4 ("block: add blk_io_schedule() for avoiding task hung in sync dio")
Reported-by: Satya Tangirala <satyat@google.com>
Tested-by: Satya Tangirala <satyat@google.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
 include/linux/blkdev.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Christoph Hellwig May 14, 2020, 6:41 a.m. UTC | #1
Can you please just move the function out of line?  If we context
switch it is by definition to performance critical enough to be an
inline function bloating the callers..
Ming Lei May 14, 2020, 8:12 a.m. UTC | #2
On Wed, May 13, 2020 at 11:41:33PM -0700, Christoph Hellwig wrote:
> Can you please just move the function out of line?  If we context
> switch it is by definition to performance critical enough to be an
> inline function bloating the callers..
> 

Looks blk_io_schedule() is only called from CONFG_BLOCK code, so it is
better to export it as one symbol.

Thanks,
Ming
diff mbox series

Patch

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 5360696d85ff..bf99a723673b 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -4,6 +4,7 @@ 
 
 #include <linux/sched.h>
 #include <linux/sched/clock.h>
+#include <linux/sched/sysctl.h>
 
 #ifdef CONFIG_BLOCK
 
@@ -27,7 +28,6 @@ 
 #include <linux/percpu-refcount.h>
 #include <linux/scatterlist.h>
 #include <linux/blkzoned.h>
-#include <linux/sched/sysctl.h>
 
 struct module;
 struct scsi_ioctl_command;