Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 539294b7 authored by James Bottomley's avatar James Bottomley
Browse files

Merge remote-tracking branch 'mkp-scsi/4.8/scsi-fixes' into fixes

parents 14a5916e 8d58881b

drivers/scsi/hosts.c

+2 −0
Original line number Diff line number Diff line
@@ -486,6 +486,8 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) 
	else

		shost->dma_boundary = 0xffffffff;



	shost->use_blk_mq = scsi_use_blk_mq;



	device_initialize(&shost->shost_gendev);

	dev_set_name(&shost->shost_gendev, "host%d", shost->host_no);

	shost->shost_gendev.bus = &scsi_bus_type;

drivers/scsi/scsi.c

+0 −1
Original line number Diff line number Diff line
@@ -1160,7 +1160,6 @@ bool scsi_use_blk_mq = true; 
bool scsi_use_blk_mq = false;

#endif

module_param_named(use_blk_mq, scsi_use_blk_mq, bool, S_IWUSR | S_IRUGO);

EXPORT_SYMBOL_GPL(scsi_use_blk_mq);



static int __init init_scsi(void)

{

drivers/scsi/scsi_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ extern int scsi_init_hosts(void); 
extern void scsi_exit_hosts(void);



/* scsi.c */

extern bool scsi_use_blk_mq;

extern int scsi_setup_command_freelist(struct Scsi_Host *shost);

extern void scsi_destroy_command_freelist(struct Scsi_Host *shost);

#ifdef CONFIG_SCSI_LOGGING

include/scsi/scsi_host.h

+1 −4
Original line number Diff line number Diff line
@@ -771,12 +771,9 @@ static inline int scsi_host_in_recovery(struct Scsi_Host *shost) 
		shost->tmf_in_progress;

}



extern bool scsi_use_blk_mq;



static inline bool shost_use_blk_mq(struct Scsi_Host *shost)

{

	return scsi_use_blk_mq;



	return shost->use_blk_mq;

}



extern int scsi_queue_work(struct Scsi_Host *, struct work_struct *);