From patchwork Wed Nov 7 10:18:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanlong Gao X-Patchwork-Id: 1709871 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id CF97BDFB7A for ; Wed, 7 Nov 2012 10:50:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754496Ab2KGKsw (ORCPT ); Wed, 7 Nov 2012 05:48:52 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:9087 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753557Ab2KGKsu (ORCPT ); Wed, 7 Nov 2012 05:48:50 -0500 X-IronPort-AV: E=Sophos;i="4.80,729,1344182400"; d="scan'208";a="6154926" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 07 Nov 2012 18:47:08 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id qA7AImaZ023559; Wed, 7 Nov 2012 18:18:51 +0800 Received: from gaowanlong.fnst.cn.fujitsu.com ([10.167.225.197]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012110718175460-1001398 ; Wed, 7 Nov 2012 18:17:54 +0800 From: Wanlong Gao To: linux-kernel@vger.kernel.org Cc: "James E.J. Bottomley" , Paolo Bonzini , Rusty Russell , linux-scsi@vger.kernel.org, kvm@vger.kernel.org, Wanlong Gao Subject: [PATCH 2/5] virtio-scsi: remove the needless variable gfp_mask Date: Wed, 7 Nov 2012 18:18:11 +0800 Message-Id: <1352283494-31200-3-git-send-email-gaowanlong@cn.fujitsu.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1352283494-31200-1-git-send-email-gaowanlong@cn.fujitsu.com> References: <1352283494-31200-1-git-send-email-gaowanlong@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/11/07 18:17:54, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/11/07 18:17:58, Serialize complete at 2012/11/07 18:17:58 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Just use the macro instead of define a variable. Cc: James E.J. Bottomley Cc: Paolo Bonzini Cc: Rusty Russell Cc: linux-scsi@vger.kernel.org Cc: kvm@vger.kernel.org Signed-off-by: Wanlong Gao --- drivers/scsi/virtio_scsi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index 8746c37..5390229 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c @@ -587,11 +587,10 @@ static struct virtio_scsi_target_state *virtscsi_alloc_tgt( struct virtio_device *vdev, int sg_elems) { struct virtio_scsi_target_state *tgt; - gfp_t gfp_mask = GFP_KERNEL; /* We need extra sg elements at head and tail. */ tgt = kmalloc(sizeof(*tgt) + sizeof(tgt->sg[0]) * (sg_elems + 2), - gfp_mask); + GFP_KERNEL); if (!tgt) return NULL;