| Message ID | 20190807144948.28265-2-maier@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | scsi: core: regression fixes for request batching | expand |
On Wed, Aug 7, 2019 at 10:55 PM Steffen Maier <maier@linux.ibm.com> wrote: > > This was missing from scsi_mq_ops_no_commit of linux-next commit > 8930a6c20791 ("scsi: core: add support for request batching") > from Martin's scsi/5.4/scsi-queue or James' scsi/misc. > > See also linux-next commit b7e9e1fb7a92 ("scsi: implement .cleanup_rq > callback") from block/for-next. > > Signed-off-by: Steffen Maier <maier@linux.ibm.com> > Fixes: 8930a6c20791 ("scsi: core: add support for request batching") > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Ming Lei <ming.lei@redhat.com> > --- > drivers/scsi/scsi_lib.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c > index ae03d3e2600f..90c257622bb0 100644 > --- a/drivers/scsi/scsi_lib.c > +++ b/drivers/scsi/scsi_lib.c > @@ -1834,6 +1834,7 @@ static const struct blk_mq_ops scsi_mq_ops_no_commit = { > .init_request = scsi_mq_init_request, > .exit_request = scsi_mq_exit_request, > .initialize_rq_fn = scsi_initialize_rq, > + .cleanup_rq = scsi_cleanup_rq, > .busy = scsi_mq_lld_busy, > .map_queues = scsi_map_queues, > }; This one is a cross-tree thing, either scsi/5.4/scsi-queue needs to pull for-5.4/block, or do it after both land linus tree. Thanks, Ming Lei
Ming, >> + .cleanup_rq = scsi_cleanup_rq, >> .busy = scsi_mq_lld_busy, >> .map_queues = scsi_map_queues, >> }; > > This one is a cross-tree thing, either scsi/5.4/scsi-queue needs to > pull for-5.4/block, or do it after both land linus tree. I'll set up an amalgamated for-next branch tomorrow.
On 8/8/19 4:18 AM, Martin K. Petersen wrote: > > Ming, > >>> + .cleanup_rq = scsi_cleanup_rq, >>> .busy = scsi_mq_lld_busy, >>> .map_queues = scsi_map_queues, >>> }; >> >> This one is a cross-tree thing, either scsi/5.4/scsi-queue needs to >> pull for-5.4/block, or do it after both land linus tree. > > I'll set up an amalgamated for-next branch tomorrow. Martin, is it possible that you re-wrote your for-next and it now no longer contains a merged 5.4/scsi-postmerge with those fixes? At least I cannot find the fix code in next-20190917 and it fails again for me.
Steffen, > Martin, is it possible that you re-wrote your for-next and it now no > longer contains a merged 5.4/scsi-postmerge with those fixes? At > least I cannot find the fix code in next-20190917 and it fails again > for me. Yes, looks like you're right. Not sure how I managed to mess that up. I must have inadvertently done a reset in the wrong worktree because my for-next branch maintenance script only does merges. In any case, since Linus has pulled the block tree dependencies, I'll rebase the postmerge branch on top of current linus/master and create a new for-next. Thanks for the heads-up!
On Wed, Sep 18, 2019 at 05:09:50PM +0200, Steffen Maier wrote: > On 8/8/19 4:18 AM, Martin K. Petersen wrote: > > I'll set up an amalgamated for-next branch tomorrow. > Martin, is it possible that you re-wrote your for-next and it now no longer > contains a merged 5.4/scsi-postmerge with those fixes? > At least I cannot find the fix code in next-20190917 and it fails again for me. Well, there's no sign of a branch called postmerge in the SCSI history recently and I've not run into any SCSI-related conflicts so...
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index ae03d3e2600f..90c257622bb0 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1834,6 +1834,7 @@ static const struct blk_mq_ops scsi_mq_ops_no_commit = { .init_request = scsi_mq_init_request, .exit_request = scsi_mq_exit_request, .initialize_rq_fn = scsi_initialize_rq, + .cleanup_rq = scsi_cleanup_rq, .busy = scsi_mq_lld_busy, .map_queues = scsi_map_queues, };
This was missing from scsi_mq_ops_no_commit of linux-next commit 8930a6c20791 ("scsi: core: add support for request batching") from Martin's scsi/5.4/scsi-queue or James' scsi/misc. See also linux-next commit b7e9e1fb7a92 ("scsi: implement .cleanup_rq callback") from block/for-next. Signed-off-by: Steffen Maier <maier@linux.ibm.com> Fixes: 8930a6c20791 ("scsi: core: add support for request batching") Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Ming Lei <ming.lei@redhat.com> --- drivers/scsi/scsi_lib.c | 1 + 1 file changed, 1 insertion(+)