From patchwork Tue Aug 3 02:06:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Ma X-Patchwork-Id: 60710 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id ACE97B70A6 for ; Tue, 3 Aug 2010 12:08:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751357Ab0HCCIh (ORCPT ); Mon, 2 Aug 2010 22:08:37 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:33477 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751330Ab0HCCIg (ORCPT ); Mon, 2 Aug 2010 22:08:36 -0400 Received: from rcsinet13.oracle.com (rcsinet13.oracle.com [148.87.113.125]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id o7328MEJ031487 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 3 Aug 2010 02:08:23 GMT Received: from acsmt353.oracle.com (acsmt353.oracle.com [141.146.40.153]) by rcsinet13.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o7328KYr021440; Tue, 3 Aug 2010 02:08:20 GMT Received: from abhmt001.oracle.com by acsmt353.oracle.com with ESMTP id 459761391280801205; Mon, 02 Aug 2010 19:06:45 -0700 Received: from localhost.localdomain (/10.182.120.225) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 02 Aug 2010 19:06:45 -0700 From: Tao Ma To: linux-kernel@vger.kernel.org Cc: davem@davemloft.net, linux-ide@vger.kernel.org, Tao Ma , FUJITA Tomonori Subject: [PATCH v2] ide: Use kzalloc in idedisk_prep_fn. Date: Tue, 3 Aug 2010 10:06:32 +0800 Message-Id: <1280801192-14419-1-git-send-email-tao.ma@oracle.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <20100803010903I.fujita.tomonori@lab.ntt.co.jp> References: <20100803010903I.fujita.tomonori@lab.ntt.co.jp> X-Source-IP: acsmt353.oracle.com [141.146.40.153] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090203.4C577A16.012D:SCFMA4539814,ss=1,fgs=0 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org > > This change conflicts with the change in linux-next (came from Jens' > tree). Thanks for pointing it out. Here is the updated one. Regards, Tao From 5b8ae2eb7e3ecb54ea8db3b296727106148f17b3 Mon Sep 17 00:00:00 2001 From: Tao Ma Date: Tue, 3 Aug 2010 08:18:27 +0800 Subject: [PATCH v2] ide: Use kzalloc in idedisk_prep_fn. Signed-off-by: Tao Ma Cc: FUJITA Tomonori --- drivers/ide/ide-disk.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 7433e07..471bb0d 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c @@ -435,12 +435,11 @@ static int idedisk_prep_fn(struct request_queue *q, struct request *rq) if (!(rq->cmd_flags & REQ_FLUSH)) return BLKPREP_OK; - cmd = kmalloc(sizeof(*cmd), GFP_ATOMIC); + cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC); /* FIXME: map struct ide_taskfile on rq->cmd[] */ BUG_ON(cmd == NULL); - memset(cmd, 0, sizeof(*cmd)); if (ata_id_flush_ext_enabled(drive->id) && (drive->capacity64 >= (1UL << 28))) cmd->tf.command = ATA_CMD_FLUSH_EXT;