Message ID | 1493391340-24629-8-git-send-email-axboe@fb.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 04/28/2017 04:55 PM, Jens Axboe wrote: > This reverts commit 4981d04dd8f1ab19e2cce008da556d7f099b6e68. > > The driver has been converted to using the proper infrastructure > for issuing internal commands. This means it's now safe to use with > the scheduling infrastruture, so we can now revert the change > that turned off scheduling for mtip32xx. > > Reviewed-by: Ming Lei <ming.lei@redhat.com> > Signed-off-by: Jens Axboe <axboe@fb.com> > --- > drivers/block/mtip32xx/mtip32xx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c > index 9780c4d3697c..c598c5ac2fd0 100644 > --- a/drivers/block/mtip32xx/mtip32xx.c > +++ b/drivers/block/mtip32xx/mtip32xx.c > @@ -3964,7 +3964,7 @@ static int mtip_block_initialize(struct driver_data *dd) > dd->tags.reserved_tags = 1; > dd->tags.cmd_size = sizeof(struct mtip_cmd); > dd->tags.numa_node = dd->numa_node; > - dd->tags.flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_NO_SCHED; > + dd->tags.flags = BLK_MQ_F_SHOULD_MERGE; > dd->tags.driver_data = dd; > dd->tags.timeout = MTIP_NCQ_CMD_TIMEOUT_MS; > > Reviewed-by: Hannes Reinecke <hare@suse.com> Cheers, Hannes
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index 9780c4d3697c..c598c5ac2fd0 100644 --- a/drivers/block/mtip32xx/mtip32xx.c +++ b/drivers/block/mtip32xx/mtip32xx.c @@ -3964,7 +3964,7 @@ static int mtip_block_initialize(struct driver_data *dd) dd->tags.reserved_tags = 1; dd->tags.cmd_size = sizeof(struct mtip_cmd); dd->tags.numa_node = dd->numa_node; - dd->tags.flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_NO_SCHED; + dd->tags.flags = BLK_MQ_F_SHOULD_MERGE; dd->tags.driver_data = dd; dd->tags.timeout = MTIP_NCQ_CMD_TIMEOUT_MS;