Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-07 21:53:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
ca0e1b9afb
linux-stable/drivers/scsi/libsas
History
Damien Le Moal 0ff10cb7f8 scsi: libsas: Fix declaration of ncq priority attributes 
Commit b4d3ddd2df ("scsi: libsas: Define NCQ Priority sysfs attributes
for SATA devices") introduced support for ATA NCQ priority control for ATA
devices managed by libsas. This commit introduces the ncq_prio_supported
and ncq_prio_enable sysfs device attributes to discover and control the use
of this features, similarly to libata.  However, libata publicly declares
these device attributes and export them for use in ATA low level
drivers. This leads to a compilation error when libsas and libata are
built-in due to the double definition:

ld: drivers/ata/libata-sata.o:/home/Linux/scsi/drivers/ata/libata-sata.c:900:
multiple definition of `dev_attr_ncq_prio_supported';
drivers/scsi/libsas/sas_ata.o:/home/Linux/scsi/drivers/scsi/libsas/sas_ata.c:984:
first defined here
ld: drivers/ata/libata-sata.o:/home/Linux/scsi/drivers/ata/libata-sata.c:1026:
multiple definition of `dev_attr_ncq_prio_enable';
drivers/scsi/libsas/sas_ata.o:/home/Linux/scsi/drivers/scsi/libsas/sas_ata.c:1022:
first defined here

Resolve this problem by directly declaring the libsas attributes instead of
using the DEVICE_ATTR() macro. And for good measure, the device attribute
variables are also renamed.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Fixes: b4d3ddd2df ("scsi: libsas: Define NCQ Priority sysfs attributes for SATA devices")
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20240327020122.439424-1-dlemoal@kernel.org
Reviewed-by: John Garry <john.g.garry@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
2024-03-27 20:13:52 -04:00
..
Kconfig scsi: libsas: Drop BLK_DEV_BSGLIB selection 2021-07-27 00:06:42 -04:00
Makefile scsi: libsas: Allow libsas to include SCSI header files directly 2021-07-20 23:11:17 -04:00
sas_ata.c scsi: libsas: Fix declaration of ncq priority attributes 2024-03-27 20:13:52 -04:00
sas_discover.c scsi: libsas: Declare sas_discover_end_dev() static 2023-09-13 21:06:44 -04:00
sas_event.c scsi: libsas: Use bool for queue_work() return code 2022-02-27 21:48:30 -05:00
sas_expander.c scsi: libsas: Fix disk not being scanned in after being removed 2024-03-10 18:02:54 -04:00
sas_host_smp.c scsi: libsas: Delete struct scsi_core 2023-08-21 17:50:58 -04:00
sas_init.c scsi: libsas: Declare sas_set_phy_speed() static 2023-09-13 21:06:44 -04:00
sas_internal.h scsi: libsas: Move local functions declarations to sas_internal.h 2023-09-13 21:06:44 -04:00
sas_phy.c scsi: libsas: Delete struct scsi_core 2023-08-21 17:50:58 -04:00
sas_port.c scsi: libsas: Delete struct scsi_core 2023-08-21 17:50:58 -04:00
sas_scsi_host.c scsi: libsas: Simplify sas_queue_reset() and remove unused code 2023-08-30 21:24:50 -04:00
sas_task.c scsi: libsas: Use enum for response frame DATAPRES field 2022-02-19 15:59:34 -05:00