From patchwork Tue Oct 30 20:14:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Moyer X-Patchwork-Id: 195617 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 471C62C007E for ; Wed, 31 Oct 2012 07:19:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756159Ab2J3USx (ORCPT ); Tue, 30 Oct 2012 16:18:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48187 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753650Ab2J3UPS (ORCPT ); Tue, 30 Oct 2012 16:15:18 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9UKFEcJ015932 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 30 Oct 2012 16:15:15 -0400 Received: from segfault.boston.devel.redhat.com (segfault.boston.devel.redhat.com [10.16.60.26]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q9UKFDkx003694 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 30 Oct 2012 16:15:14 -0400 Received: from segfault.boston.devel.redhat.com (localhost.localdomain [127.0.0.1]) by segfault.boston.devel.redhat.com (8.14.4/8.14.4) with ESMTP id q9UKFD6u029479; Tue, 30 Oct 2012 16:15:13 -0400 Received: (from jmoyer@localhost) by segfault.boston.devel.redhat.com (8.14.4/8.14.4/Submit) id q9UKFCWJ029478; Tue, 30 Oct 2012 16:15:12 -0400 From: Jeff Moyer To: linux-kernel@vger.kernel.org Cc: Jeff Garzik , linux-ide@vger.kernel.org Subject: [patch 06/10] ata: use scsi_host_alloc_node Date: Tue, 30 Oct 2012 16:14:40 -0400 Message-Id: <1351628084-29358-9-git-send-email-jmoyer@redhat.com> In-Reply-To: <1351628084-29358-1-git-send-email-jmoyer@redhat.com> References: <1351628084-29358-1-git-send-email-jmoyer@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Signed-off-by: Jeff Moyer --- drivers/ata/libata-scsi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index e3bda07..9d5dd09 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -3586,7 +3586,8 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht) struct Scsi_Host *shost; rc = -ENOMEM; - shost = scsi_host_alloc(sht, sizeof(struct ata_port *)); + shost = scsi_host_alloc_node(sht, sizeof(struct ata_port *), + dev_to_node(host->dev)); if (!shost) goto err_alloc;