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

Configure Feed

Select the types of activity you want to include in your feed.

scsi: core: Rename scsi_softirq_done() into scsi_complete()

Commit 320ae51feed5 ("blk-mq: new multi-queue block IO queueing mechanism";
v3.13) introduced a code path that calls the blk-mq completion function
from interrupt context. scsi-mq was introduced by commit d285203cf647
("scsi: add support for a blk-mq based I/O path."; v3.17).

Since the introduction of scsi-mq, scsi_softirq_done() can be called from
interrupt context. That made the name of the function misleading, rename it
to scsi_complete().

Link: https://lore.kernel.org/r/20210415220826.29438-4-bvanassche@acm.org
Cc: Christoph Hellwig <hch@lst.de>
Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Bart Van Assche and committed by
Martin K. Petersen 0d2810cd 886874af

+7 -3
+7 -3
drivers/scsi/scsi_lib.c
··· 1434 1434 return false; 1435 1435 } 1436 1436 1437 - static void scsi_softirq_done(struct request *rq) 1437 + /* 1438 + * Block layer request completion callback. May be called from interrupt 1439 + * context. 1440 + */ 1441 + static void scsi_complete(struct request *rq) 1438 1442 { 1439 1443 struct scsi_cmnd *cmd = blk_mq_rq_to_pdu(rq); 1440 1444 int disposition; ··· 1893 1889 .get_budget = scsi_mq_get_budget, 1894 1890 .put_budget = scsi_mq_put_budget, 1895 1891 .queue_rq = scsi_queue_rq, 1896 - .complete = scsi_softirq_done, 1892 + .complete = scsi_complete, 1897 1893 .timeout = scsi_timeout, 1898 1894 #ifdef CONFIG_BLK_DEBUG_FS 1899 1895 .show_rq = scsi_show_rq, ··· 1923 1919 .put_budget = scsi_mq_put_budget, 1924 1920 .queue_rq = scsi_queue_rq, 1925 1921 .commit_rqs = scsi_commit_rqs, 1926 - .complete = scsi_softirq_done, 1922 + .complete = scsi_complete, 1927 1923 .timeout = scsi_timeout, 1928 1924 #ifdef CONFIG_BLK_DEBUG_FS 1929 1925 .show_rq = scsi_show_rq,