On Wed, Oct 22, 2008 at 2:33 PM, FUJITA Tomonori
<fujita.tomonori@xxxxxxxxxxxxx> wrote:
>
> diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
> index 28c9da7..7dc62de 100644
> --- a/drivers/scsi/megaraid.c
> +++ b/drivers/scsi/megaraid.c
> @@ -4402,6 +4402,10 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru)
> scb_t *scb;
> int rval;
>
> + scmd = scsi_allocate_command(GFP_KERNEL);
> + if (!scmd)
> + return -ENOMEM;
> +
> /*
> * The internal commands share one command id and hence are
> * serialized. This is so because we want to reserve maximum number of
> @@ -4412,12 +4416,11 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru)
> scb = &adapter->int_scb;
> memset(scb, 0, sizeof(scb_t));
>
> - scmd = &adapter->int_scmd;
> - memset(scmd, 0, sizeof(Scsi_Cmnd));
> -
> sdev = kzalloc(sizeof(struct scsi_device), GFP_KERNEL);
> scmd->device = sdev;
>
> + memset(adapter->int_cdb, 0, sizeof(adapter->int_cdb));
> + scmd->cmnd = adapter->int_cdb;
> scmd->device->host = adapter->host;
> scmd->host_scribble = (void *)scb;
> scmd->cmnd[0] = MEGA_INTERNAL_CMD;
> @@ -4456,6 +4459,8 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru)
>
> mutex_unlock(&adapter->int_mtx);
>
> + scsi_free_command(GFP_KERNEL, scmd);
> +
> return rval;
> }
>
> diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
> index ee70bd4..795201f 100644
> --- a/drivers/scsi/megaraid.h
> +++ b/drivers/scsi/megaraid.h
> @@ -888,8 +888,8 @@ typedef struct {
>
> u8 sglen; /* f/w supported scatter-gather list length */
>
> + unsigned char int_cdb[MAX_COMMAND_SIZE];
> scb_t int_scb;
> - Scsi_Cmnd int_scmd;
> struct mutex int_mtx; /* To synchronize the internal
> commands */
> struct completion int_waitq; /* wait queue for internal
>
I confirm that this patch fixes the oops and I can now read the usual info
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
