From patchwork Fri Nov 18 19:30:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 696733 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3tL7Pw4pPTz9t10; Sat, 19 Nov 2016 06:30:44 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b="hhRlL8ZN"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1c7ory-0007wN-3C; Fri, 18 Nov 2016 19:30:42 +0000 Received: from mail-it0-f54.google.com ([209.85.214.54]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1c7orp-0007pT-Ev for kernel-team@lists.ubuntu.com; Fri, 18 Nov 2016 19:30:33 +0000 Received: by mail-it0-f54.google.com with SMTP id j191so49055909ita.1 for ; Fri, 18 Nov 2016 11:30:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=wl/YaRfvk0PUOVuXxcQfBo4bAYis0q6sWMmLojW/pq0=; b=hhRlL8ZN6YbzJUlvjGBIKkfsc/mg5gHfqB/DSHPP7bqGeumd+uTgJIP5GpxPIVl0/g nuCILO8JA7icxIAejwuoAvrhlim5OsJw1RJxDU4py39swZ+DAzZ39INIkFe/z+dhF8kn gxqBPYI4fI8QRDHyCSoajfQj5JBqC4goHAEFBqGWcw7Dq/62VPnB98r6fgw7Rpk1Vl4a erhU5bI+0x4bUmzNO5SAzXdDENzG4Ggicdji38RUQ0wpvD3dGLUC6fgktHxyalxsUPtg 1D0R1uKKLbpDYjRPSIJ8w1lMYoeODsznUINvRBU+TACd5oTswXxRCS4Ffgj6qw53ytLz +sIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=wl/YaRfvk0PUOVuXxcQfBo4bAYis0q6sWMmLojW/pq0=; b=NOz6rCzDEfOgtkAxUs9uJK1bQ3mi4IVDnNJ+rn0dQPIE0NkavtJPbVE3UKzWB+fCoy Qy2NXEbrCJ3ipEt/5CFSL/cAJIj/LhsjqLPfd556+RpHynxCSQlgjGuXshrYYe2BoJw/ bA6uKrxe85sw0nWwAiRPqxCRUtGwgP0ifwE0orZpD4Tj9b0lX1oMQEqy7snHjfUv0MqV h5pQD8cNjfjDBKQOPjHnkTlQlSJZ4PTiCvTN4tGnfw9sF4HEgcz0orfTsvuuHrauvmhY QuN+q/uhTT8AYdtVS9d75BbqpttoYEu8Bmpr0v35J3DRIAtemh8+Hwm8xycv3xcW5aEL 4/6A== X-Gm-Message-State: AKaTC02UOPvdsmlH/gN3kGvWoWU4uBPgqxZ/7ZHgQKC/MHD8KqJaIgmNxn/RBiKWJmheYYG5 X-Received: by 10.107.138.212 with SMTP id c81mr1214280ioj.43.1479497432198; Fri, 18 Nov 2016 11:30:32 -0800 (PST) Received: from localhost.localdomain (host-174-45-44-32.hln-mt.client.bresnan.net. [174.45.44.32]) by smtp.gmail.com with ESMTPSA id y20sm3441348ioy.8.2016.11.18.11.30.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Nov 2016 11:30:31 -0800 (PST) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 5/6] UBUNTU: SAUCE: ibmvscsis: Return correct partition name/# to client Date: Fri, 18 Nov 2016 12:30:19 -0700 Message-Id: <1479497420-20661-6-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479497420-20661-1-git-send-email-tim.gardner@canonical.com> References: <1479497420-20661-1-git-send-email-tim.gardner@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Michael Cyr BugLink: http://bugs.launchpad.net/bugs/1642299 Signed-off-by: Michael Cyr Signed-off-by: Bryant G. Ly Signed-off-by: Tim Gardner --- drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c index 9f4434f..fcb6a7f 100644 --- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c @@ -3300,6 +3300,9 @@ static int ibmvscsis_probe(struct vio_dev *vdev, strncat(vscsi->eye, vdev->name, MAX_EYE); vscsi->dds.unit_id = vdev->unit_address; + strncpy(vscsi->dds.partition_name, partition_name, + sizeof(vscsi->dds.partition_name)); + vscsi->dds.partition_num = partition_number; spin_lock_bh(&ibmvscsis_dev_lock); list_add_tail(&vscsi->list, &ibmvscsis_dev_list); @@ -3497,7 +3500,7 @@ static int ibmvscsis_get_system_info(void) num = of_get_property(rootdn, "ibm,partition-no", NULL); if (num) - partition_number = *num; + partition_number = of_read_number(num, 1); of_node_put(rootdn);