From patchwork Mon Feb 15 08:24:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 8311081 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 681429F2F0 for ; Mon, 15 Feb 2016 08:25:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 863CF20524 for ; Mon, 15 Feb 2016 08:25:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A755E20212 for ; Mon, 15 Feb 2016 08:25:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752418AbcBOIY5 (ORCPT ); Mon, 15 Feb 2016 03:24:57 -0500 Received: from mx2.suse.de ([195.135.220.15]:46034 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752311AbcBOIY4 (ORCPT ); Mon, 15 Feb 2016 03:24:56 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 79716ADB2; Mon, 15 Feb 2016 08:24:52 +0000 (UTC) From: Hannes Reinecke To: "Martin K. Petersen" Cc: Christoph Hellwig , Bart van Assche , James Bottomley , linux-scsi@vger.kernel.org, Ewan Milne , Johannes Thumshirn , Hannes Reinecke , Hannes Reinecke Subject: [PATCHv7 12/23] scsi_dh_alua: remove 'rel_port' from alua_dh_data structure Date: Mon, 15 Feb 2016 09:24:39 +0100 Message-Id: <1455524690-121073-13-git-send-email-hare@suse.de> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1455524690-121073-1-git-send-email-hare@suse.de> References: <1455524690-121073-1-git-send-email-hare@suse.de> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The 'relative port' field is not used, and might get stale when the port group changes. So remove the field altogether. Reviewed-by: Christoph Hellwig Signed-off-by: Hannes Reinecke Reviewed-by: Bart Van Assche --- drivers/scsi/device_handler/scsi_dh_alua.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c index 0212aee..78e6fa9 100644 --- a/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/drivers/scsi/device_handler/scsi_dh_alua.c @@ -87,7 +87,6 @@ struct alua_port_group { struct alua_dh_data { struct alua_port_group *pg; int group_id; - int rel_port; struct scsi_device *sdev; activate_complete callback_fn; void *callback_data; @@ -325,12 +324,10 @@ static int alua_check_vpd(struct scsi_device *sdev, struct alua_dh_data *h, return SCSI_DH_NOMEM; return SCSI_DH_DEV_UNSUPP; } - h->rel_port = rel_port; - sdev_printk(KERN_INFO, sdev, "%s: device %s port group %x rel port %x\n", ALUA_DH_NAME, h->pg->device_id_str, - h->group_id, h->rel_port); + h->group_id, rel_port); return alua_rtpg(sdev, h->pg); } @@ -764,7 +761,6 @@ static int alua_bus_attach(struct scsi_device *sdev) if (!h) return -ENOMEM; h->pg = NULL; - h->rel_port = -1; h->sdev = sdev; err = alua_initialize(sdev, h);