Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp5340241rwb; Mon, 21 Nov 2022 21:18:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf6F8tobvHsRsnXU6eXdpvzKwFbUNJ/mDECiWITsNjFjaHd1ipTbpD7NEKoLTqujlbGEaA7q X-Received: by 2002:a17:906:2650:b0:7b2:c004:55fe with SMTP id i16-20020a170906265000b007b2c00455femr13445993ejc.742.1669094301747; Mon, 21 Nov 2022 21:18:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669094301; cv=none; d=google.com; s=arc-20160816; b=Ix7NOx6HMMUd8wcJ8qxPgexFbOFM9t4USZ3WbqXqLDDZbEUioTmJEFQvLAHofrspt7 Q6PFqyKShHy5z+PCl1+B1KSdBLqW77bBmKR2lZPuJlxRFXH4+e/tGNVXmfJVhOUSg/9v ia1QPgmvdwrj/GK3qTxDmBreukvqtZy9tqVWxtIg2A4v8SXIarpsxe5r1oFnYjdHht6T zeGjqXM5Zb28bmVCRTBZLNF/VbxhptESq2d9RJvAxxYE98839iTiCSumeq90UVeJtnxu c9Rq1i1FyH+bt+z7RakuponRmajEFK0cufvdAmnc1aLAY+Zt4YdDbmmx2mkvsDYzf4Kp ZZBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=TMjyj29NwjCv8aU+GqfsSValahXnto3d4pkE5xa6QMc=; b=L7HW5ZxvEC1+dzkZ1C/9X4KeVHRYSyUsdCxM7lIrkUg8olPTnGMG4EfGhdynqLriUq PqPVh6hNCS8fHc+fWAkXehyJ3dht3h6hYGPNrofWUrbzc6pyQlM5e6LbgMhF4/cbsoFV oeaTbTvTafSFvf9t5nHvvOKGyZbkObm/Ml0vNu32VmfPRF4yOlm6vekK1BtOq5mtnBtb QTRgaY67UZgGy0Pv/xCfVuuv256yjcknuuXhurQAkTOvVrsc7Ju5HcseQVYLyt7ECtX8 VjH1I1b9hCPtHKP6aNcrqDC4RyLnfEi7n2+1XH3/rpoixrU6P3VhHvOMNK4ia0BJHSB8 GlHA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z18-20020a05640240d200b00463a4ca44e0si12334007edb.138.2022.11.21.21.17.59; Mon, 21 Nov 2022 21:18:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231147AbiKVEzM (ORCPT + 92 others); Mon, 21 Nov 2022 23:55:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230139AbiKVEzJ (ORCPT ); Mon, 21 Nov 2022 23:55:09 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12F132A70E; Mon, 21 Nov 2022 20:55:08 -0800 (PST) Received: from dggpemm500020.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NGX3y0LWmzRpQd; Tue, 22 Nov 2022 12:54:38 +0800 (CST) Received: from dggpemm500017.china.huawei.com (7.185.36.178) by dggpemm500020.china.huawei.com (7.185.36.49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 22 Nov 2022 12:55:06 +0800 Received: from build.huawei.com (10.175.101.6) by dggpemm500017.china.huawei.com (7.185.36.178) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 22 Nov 2022 12:55:05 +0800 From: Wenchao Hao To: Lee Duncan , Chris Leech , "Mike Christie" , "James E . J . Bottomley" , "Martin K . Petersen" , , CC: , , , Wenchao Hao Subject: [PATCH] scsi:iscsi: rename iscsi_set_param to iscsi_if_set_param Date: Tue, 22 Nov 2022 18:11:05 +0000 Message-ID: <20221122181105.4123935-1-haowenchao@huawei.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm500017.china.huawei.com (7.185.36.178) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_12_24, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are two iscsi_set_param() functions individually defined in libiscsi.c and scsi_transport_iscsi.c which is confused. So rename the one in scsi_transport_iscsi.c to iscsi_if_set_param(). Signed-off-by: Wenchao Hao --- drivers/scsi/scsi_transport_iscsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index cd3db9684e52..c3fe5ecfee59 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c @@ -2988,7 +2988,7 @@ iscsi_if_destroy_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev } static int -iscsi_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev) +iscsi_if_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev) { char *data = (char*)ev + sizeof(*ev); struct iscsi_cls_conn *conn; @@ -3941,7 +3941,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) err = -EINVAL; break; case ISCSI_UEVENT_SET_PARAM: - err = iscsi_set_param(transport, ev); + err = iscsi_if_set_param(transport, ev); break; case ISCSI_UEVENT_CREATE_CONN: case ISCSI_UEVENT_DESTROY_CONN: -- 2.35.3