Skip to contentSkip to conversation

patch scsi-mpt2sas-add-missing-initialization-of-scsih_cmds.patch added to 2.6.32-stable tree

DISCUSSION Stefan Lippers-Hollmann 3 participants 4 messages Jan 4, 2010 – Jan 5, 2010 1 message not in the archive

lore
Share & tools
lore
#1 lore raw
In reply to a message not in the archive

Hi

Quoted 7 lines · On Monday 04 January 2010, [email protected] wrote:

This is a note to let you know that we have just queued up the patch titled

Subject: SCSI: mpt2sas: add missing initialization of scsih_cmds

to the 2.6.32-stable tree. Its filename is

scsi-mpt2sas-add-missing-initialization-of-scsih_cmds.patch

Adding this patch to 2.6.32 (and likely 2.6.31 as well) breaks building the current stable queue:

LD drivers/scsi/mpt2sas/built-in.o
CC [M] drivers/scsi/mpt2sas/mpt2sas_base.o
drivers/scsi/mpt2sas/mpt2sas_base.c: In function 'mpt2sas_base_attach':
drivers/scsi/mpt2sas/mpt2sas_base.c:3500: error: 'struct MPT2SAS_ADAPTER' has no member named 'scsih_cmds' drivers/scsi/mpt2sas/mpt2sas_base.c:3501: error: 'struct MPT2SAS_ADAPTER' has no member named 'scsih_cmds' drivers/scsi/mpt2sas/mpt2sas_base.c:3502: error: 'struct MPT2SAS_ADAPTER' has no member named 'scsih_cmds' make[6]: *** [drivers/scsi/mpt2sas/mpt2sas_base.o] Error 1
make[5]: *** [drivers/scsi/mpt2sas] Error 2

Quoted 22 lines

A git repo of this tree can be found at
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

From d685c262083dcd5fd98b7499b22a377a3225229c Mon Sep 17 00:00:00 2001
From: Kashyap, Desai <[email protected]>
Date: Tue, 17 Nov 2009 13:16:37 +0530
Subject: SCSI: mpt2sas: add missing initialization of scsih_cmds

From: Kashyap, Desai <[email protected]>

commit d685c262083dcd5fd98b7499b22a377a3225229c upstream.

Internal command scsih_cmds init is included in mpt2sas_base_attach.

drivers/scsi/mpt2sas/mpt2sas_base.c mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc) · line 3590

Quoted 8 lines
drivers/scsi/mpt2sas/mpt2sas_base.c +5 -0
@@ -3583,6 +3583,11 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc)
 	ioc->transport_cmds.status = MPT2_CMD_NOT_USED;
 	mutex_init(&ioc->transport_cmds.mutex);
 
+	/* scsih internal command bits */
+	ioc->scsih_cmds.reply = kzalloc(ioc->reply_sz, GFP_KERNEL);
+	ioc->scsih_cmds.status = MPT2_CMD_NOT_USED;
+	mutex_init(&ioc->scsih_cmds.mutex);
+

As it seems, the scsih struct member of MPT2SAS_ADAPTER was only added to drivers/scsi/mpt2sas/mpt2sas_base.h during the 2.6.33 merge window, so this patch doesn't seem to be necessary for <2.6.33-rcX.

drivers/scsi/mpt2sas/mpt2sas_base.c mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc) · line 3593

Quoted 3 lines
drivers/scsi/mpt2sas/mpt2sas_base.c +0 -0
 	/* task management internal command bits */
 	ioc->tm_cmds.reply = kzalloc(ioc->reply_sz, GFP_KERNEL);
 	ioc->tm_cmds.status = MPT2_CMD_NOT_USED;

Regards
Stefan Lippers-Hollmann

#2 lore raw
Quoted 14 lines · Stefan Lippers-Hollmann

Hi

Quoted 7 lines · On Monday 04 January 2010, [email protected] wrote:

This is a note to let you know that we have just queued up the patch titled

Subject: SCSI: mpt2sas: add missing initialization of scsih_cmds

to the 2.6.32-stable tree. Its filename is

scsi-mpt2sas-add-missing-initialization-of-scsih_cmds.patch

Adding this patch to 2.6.32 (and likely 2.6.31 as well) breaks building the current stable queue:

Quoted 8 lines

LD drivers/scsi/mpt2sas/built-in.o
CC [M] drivers/scsi/mpt2sas/mpt2sas_base.o
drivers/scsi/mpt2sas/mpt2sas_base.c: In function 'mpt2sas_base_attach':
drivers/scsi/mpt2sas/mpt2sas_base.c:3500: error: 'struct MPT2SAS_ADAPTER' has no member named 'scsih_cmds' drivers/scsi/mpt2sas/mpt2sas_base.c:3501: error: 'struct MPT2SAS_ADAPTER' has no member named 'scsih_cmds' drivers/scsi/mpt2sas/mpt2sas_base.c:3502: error: 'struct MPT2SAS_ADAPTER' has no member named 'scsih_cmds' make[6]: *** [drivers/scsi/mpt2sas/mpt2sas_base.o] Error 1
make[5]: *** [drivers/scsi/mpt2sas] Error 2

Thanks, your build system seems faster than mine :)

I've deleted this patch from both the .31 and .32 queues.

greg k-h

#3 lore raw

Greg and Stefan,

This patch is counter part of
http://git.kernel.org/?p=linux/kernel/git/jejb/scsi-misc-2.6.git;a=commit;h=744090d38b47ed8ead8f68b6f0c65866c0b9b17a

.31 And .32 does not required this patch to be added, since it does not have commit 744090d38b47ed8ead8f68b6f0c65866c0b9b17a.

Thanks,
Kashyap

Quoted 43 lines

-----Original Message-----
From: Greg KH [mailto:[email protected]]
Sent: Tuesday, January 05, 2010 5:14 AM
To: Stefan Lippers-Hollmann
Cc: [email protected]; Desai, Kashyap; [email protected]; [email protected]
Subject: Re: patch scsi-mpt2sas-add-missing-initialization-of- scsih_cmds.patch added to 2.6.32-stable tree

Quoted 4 lines · Stefan Lippers-Hollmann

Hi

Quoted 1 line · On Monday 04 January 2010, [email protected] wrote:

This is a note to let you know that we have just queued up the patch

titled

Quoted 8 lines
Quoted 6 lines

Subject: SCSI: mpt2sas: add missing initialization of scsih_cmds

to the 2.6.32-stable tree. Its filename is

scsi-mpt2sas-add-missing-initialization-of-scsih_cmds.patch

Adding this patch to 2.6.32 (and likely 2.6.31 as well) breaks building

the

Quoted 6 lines

current stable queue:

LD drivers/scsi/mpt2sas/built-in.o
CC [M] drivers/scsi/mpt2sas/mpt2sas_base.o
drivers/scsi/mpt2sas/mpt2sas_base.c: In function 'mpt2sas_base_attach':
drivers/scsi/mpt2sas/mpt2sas_base.c:3500: error: 'struct

MPT2SAS_ADAPTER' has no member named 'scsih_cmds'

Quoted 1 line

drivers/scsi/mpt2sas/mpt2sas_base.c:3501: error: 'struct

MPT2SAS_ADAPTER' has no member named 'scsih_cmds'

Quoted 1 line

drivers/scsi/mpt2sas/mpt2sas_base.c:3502: error: 'struct

MPT2SAS_ADAPTER' has no member named 'scsih_cmds'

Quoted 2 lines

make[6]: *** [drivers/scsi/mpt2sas/mpt2sas_base.o] Error 1 make[5]: *** [drivers/scsi/mpt2sas] Error 2

Thanks, your build system seems faster than mine :)

I've deleted this patch from both the .31 and .32 queues.

greg k-h