From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boaz Harrosh Subject: [PATCH] gdth: Use scsi_get_command for gdth internal commands Date: Tue, 18 Mar 2008 20:18:33 +0200 Message-ID: <47E00779.3000701@panasas.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Return-path: Received: from gw-colo-pa.panasas.com ([66.238.117.130]:8491 "EHLO cassoulet.panasas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1760611AbYCSTxq (ORCPT ); Wed, 19 Mar 2008 15:53:46 -0400 Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: James Bottomley , linux-scsi Cc: Sven Schnelle This is for for the next kernel window (v2.6.26). It is based on top of both scsi-misc and scsi-rc-fixes. Once scsi-misc rebases to scsi-rc-fixes this patch can be committed. Boaz --- From: Boaz Harrosh Date: Tue, 11 Mar 2008 17:42:06 +0200 Subject: [PATCH] gdth: Use scsi_get_command for gdth internal commands use scsi_get_command() in __gdth_execute() of internal commands for two reasons. - To be insulated from future scsi-ml changes and the way scsi_cmnd is structured / allocated. - Hold onto the scsi_device while executing since execution can come from user-mode management SW through the gdth char device. Signed-off-by: Boaz Harrosh Tested-by: Sven Schnelle --- drivers/scsi/gdth.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index c6d6e7c..c6e2b8d 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c @@ -448,17 +448,10 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd, DECLARE_COMPLETION_ONSTACK(wait); int rval; - scp = kzalloc(sizeof(*scp), GFP_KERNEL); + scp = scsi_get_command(sdev, GFP_KERNEL); if (!scp) return -ENOMEM; - scp->sense_buffer = kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL); - if (!scp->sense_buffer) { - kfree(scp); - return -ENOMEM; - } - - scp->device = sdev; memset(&cmndinfo, 0, sizeof(cmndinfo)); /* use request field to save the ptr. to completion struct. */ @@ -478,8 +471,7 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd, rval = cmndinfo.status; if (info) *info = cmndinfo.info; - kfree(scp->sense_buffer); - kfree(scp); + scsi_put_command(scp); return rval; } -- 1.5.3.3