mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-25 02:50:53 +07:00
SCSI was using module_refcount() to figure out when the module was
unloading: this broke with new atomic refcounting. The code is still suspicious, but this solves the WARN_ON(). Thanks, Rusty. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJUxuOxAAoJENkgDmzRrbjxtGIP/im0s3L+wM28NdQ5zFOiIpwX 0N4y4U6Aa+rrLs27jDZtXW4ss+fr/V7pUSD1uwTrTHl9X4a3M+DLpEME5Rq40TXG MYHihlQo8PM/yCuTMFR7esF20/q9CIksuVA3GkjYqwBW+ks097+t60Yn7YSfX22U HzSiR3Pp6yPjMoZWROP576rc9VtOM6tScKU1rzwe8Bo7ayzNADmTFJR4UpQuiQhU NwHn7Lih6EGsVTtaX3KS91dA7v5Un/S4jskqAkkwOW3ipgf38LLfjETueHvDWpda szVFoMMMkqDwse2MyluiLk/80Cpl528GO24D0MMbQoPfsUi7OgxQN6t1QviRxeut pH1VyK4VrRDqhpGB+5l7PQUOk58dL4SjmIVO/G9wxMgKzw2giONJdt/zHBXMr5/l 6RYINwHEQalMoG3X+kgYKa5E1WPXeJsE4xQTBIQRsaHO+9lk95BbNUVfUgvygUPV TTaymhHhEYOsntiMHPkTI05FkK79khs/qX7lU1MVtZ9x7UaYXs3ziY7z+D5fRKf1 WgoYemWBeFZznsceacNSZGjFsaMJr6gsZ/rVuPSbytXDXSOrQsJxiENph7CnHbRk 4UJffEomjdQ93CNGBI2hCYlr4Gf5DflbwHjJbT+YXcqumkXJq4+ktSFp5aCH+9q8 901XYQ7QIJ4roIOzODUG =JI7o -----END PGP SIGNATURE----- Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux Pull one more module fix from Rusty Russell: "SCSI was using module_refcount() to figure out when the module was unloading: this broke with new atomic refcounting. The code is still suspicious, but this solves the WARN_ON()" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: scsi: always increment reference count
This commit is contained in:
commit
41592e2fb5
@ -986,9 +986,9 @@ int scsi_device_get(struct scsi_device *sdev)
|
||||
return -ENXIO;
|
||||
if (!get_device(&sdev->sdev_gendev))
|
||||
return -ENXIO;
|
||||
/* We can fail this if we're doing SCSI operations
|
||||
/* We can fail try_module_get if we're doing SCSI operations
|
||||
* from module exit (like cache flush) */
|
||||
try_module_get(sdev->host->hostt->module);
|
||||
__module_get(sdev->host->hostt->module);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -1004,14 +1004,7 @@ EXPORT_SYMBOL(scsi_device_get);
|
||||
*/
|
||||
void scsi_device_put(struct scsi_device *sdev)
|
||||
{
|
||||
#ifdef CONFIG_MODULE_UNLOAD
|
||||
struct module *module = sdev->host->hostt->module;
|
||||
|
||||
/* The module refcount will be zero if scsi_device_get()
|
||||
* was called from a module removal routine */
|
||||
if (module && module_refcount(module) != 0)
|
||||
module_put(module);
|
||||
#endif
|
||||
module_put(sdev->host->hostt->module);
|
||||
put_device(&sdev->sdev_gendev);
|
||||
}
|
||||
EXPORT_SYMBOL(scsi_device_put);
|
||||
|
Loading…
Reference in New Issue
Block a user