Attachment 314156 Details for Bug 438761 – ABI workaround for scsi_device data structure change

ABI workaround for scsi_device data structure change

abi_workaround_for_scsi_device_change (text/plain), 2.85 KB, created by IBM Bug Proxy on 2008-08-13 00:51:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: IBM Bug Proxy

Created: 2008-08-13 00:51:14 UTC

Size: 2.85 KB

patch

obsolete

>Previous patch breaks kernel ABI due to the change in the scsi_device
>data structure.
>
>This patch avoids the breakage.
>
>Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
>-----
>Index: linux-2.6.18.ppc64/include/scsi/scsi_device.h
>===================================================================
>--- linux-2.6.18.ppc64.orig/include/scsi/scsi_device.h
>+++ linux-2.6.18.ppc64/include/scsi/scsi_device.h
>@@ -162,7 +162,6 @@ struct scsi_device {
> 
> 	struct execute_work	ew; /* used to get process context on put */
> 
>-	struct scsi_dh_data	*scsi_dh_data;
> 	enum scsi_device_state sdev_state;
> 	unsigned long		sdev_data[0];
> } __attribute__((aligned(sizeof(unsigned long))));
>@@ -172,6 +171,12 @@ struct scsi_dh_devlist {
> 	char *model;
> };
> 
>+struct scsi_device_dh_data {
>+	struct scsi_device	sdev;
>+	struct scsi_dh_data	*scsi_dh_data;
>+	unsigned long		sdev_data[0];
>+} __attribute__((aligned(sizeof(unsigned long))));
>+
> struct scsi_device_handler {
> 	/* Used by the infrastructure */
> 	struct list_head list; /* list of scsi_device_handlers */
>Index: linux-2.6.18.ppc64/drivers/scsi/scsi_scan.c
>===================================================================
>--- linux-2.6.18.ppc64.orig/drivers/scsi/scsi_scan.c
>+++ linux-2.6.18.ppc64/drivers/scsi/scsi_scan.c
>@@ -204,8 +204,8 @@ static struct scsi_device *scsi_alloc_sd
> 	int display_failure_msg = 1, ret;
> 	struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
> 
>-	sdev = kzalloc(sizeof(*sdev) + shost->transportt->device_size,
>-		       GFP_ATOMIC);
>+	sdev = kzalloc(sizeof(*sdev) + shost->transportt->device_size
>+			+ sizeof(struct scsi_dh_data *), GFP_ATOMIC);
> 	if (!sdev)
> 		goto out;
> 
>Index: linux-2.6.18.ppc64/include/scsi/scsi_transport.h
>===================================================================
>--- linux-2.6.18.ppc64.orig/include/scsi/scsi_transport.h
>+++ linux-2.6.18.ppc64/include/scsi/scsi_transport.h
>@@ -101,6 +101,7 @@ scsi_transport_device_data(struct scsi_d
> {
> 	struct Scsi_Host *shost = sdev->host;
> 	return (u8 *)sdev->sdev_data
>+		+ sizeof(struct scsi_dh_data *)
> 		+ shost->transportt->device_private_offset;
> }
> 
>Index: linux-2.6.18.ppc64/drivers/scsi/scsi_dh_export.c
>===================================================================
>--- linux-2.6.18.ppc64.orig/drivers/scsi/scsi_dh_export.c
>+++ linux-2.6.18.ppc64/drivers/scsi/scsi_dh_export.c
>@@ -24,13 +24,17 @@
> 
> void store_scsi_dh_data(struct scsi_device *sdev, struct scsi_dh_data *data)
> {
>- 	sdev->scsi_dh_data = data;
>+	struct scsi_device_dh_data *s = container_of(sdev,
>+					struct scsi_device_dh_data, sdev);
>+	s->scsi_dh_data = data;
> }
> EXPORT_SYMBOL_GPL(store_scsi_dh_data);
> 
> struct scsi_dh_data *retrieve_scsi_dh_data(struct scsi_device *sdev)
> {
>- 	return sdev->scsi_dh_data;
>+	struct scsi_device_dh_data *s = container_of(sdev,
>+					struct scsi_device_dh_data, sdev);
>+	return s->scsi_dh_data;
> }
> EXPORT_SYMBOL_GPL(retrieve_scsi_dh_data);
>

Actions: View

Attachments on bug 438761: 314153 | 314154 | 314155 | 314156 | 314157 | 314158 | 314159 | 314160 | 314161 | 314162 | 314163 | 314339 | 314426 | 314828 | 314829 | 316641