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

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

Linus Torvalds a8b76b49 637029c6

+7
+4
drivers/scsi/libata-core.c
··· 82 82 module_param(atapi_enabled, int, 0444); 83 83 MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)"); 84 84 85 + int libata_fua = 0; 86 + module_param_named(fua, libata_fua, int, 0444); 87 + MODULE_PARM_DESC(fua, "FUA support (0=off, 1=on)"); 88 + 85 89 MODULE_AUTHOR("Jeff Garzik"); 86 90 MODULE_DESCRIPTION("Library module for ATA devices"); 87 91 MODULE_LICENSE("GPL");
+2
drivers/scsi/libata-scsi.c
··· 1708 1708 { 1709 1709 unsigned char model[41], fw[9]; 1710 1710 1711 + if (!libata_fua) 1712 + return 0; 1711 1713 if (!ata_id_has_fua(id)) 1712 1714 return 0; 1713 1715
+1
drivers/scsi/libata.h
··· 41 41 42 42 /* libata-core.c */ 43 43 extern int atapi_enabled; 44 + extern int libata_fua; 44 45 extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap, 45 46 struct ata_device *dev); 46 47 extern int ata_rwcmd_protocol(struct ata_queued_cmd *qc);