From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7C43C43603 for ; Fri, 20 Dec 2019 03:31:53 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7658824680 for ; Fri, 20 Dec 2019 03:31:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pPRzvIRE"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="oxp4O+oP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7658824680 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DcrE4b3RXYMan6xAFazf/DqlS7o5aQaYhF+QtCtaNq0=; b=pPRzvIREugfJ6B 1Rkz0i0uvMD3JPVnhdVN7n9XIM2FPr2XAu58T3ZYUUuPPNAKboAnau+nsCbMJoUX8pv45S98iBqU3 AhJmIym6AqHYOREZnaMWCPRT1+6VflkkqXzd3XXnqsooIvzSOREWqIWIuBhy1BzGbaH8NlCIVGHVz 3sAiO56zJkVs8hm3/3FW7k6wSsE1rsGi9rsA8Cc8dIoBfAiiK2TYkjD4yYm1iI0wvmE4odF2AcDRC WYRTcmYtWlUcet1aYgIzBpPoKZakC7SpG2Gawhat0DhTzdGExSN2+CgR3uD832lSmsqf9USOTiv+F mYl9UEwfDTuLqfj08Xgg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ii914-0006r7-1j; Fri, 20 Dec 2019 03:31:50 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ii90Z-0006R8-Sc for linux-nvme@lists.infradead.org; Fri, 20 Dec 2019 03:31:21 +0000 Received: from localhost (36-236-5-169.dynamic-ip.hinet.net [36.236.5.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F2EC124680; Fri, 20 Dec 2019 03:31:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576812679; bh=Nzli6fnHFG3frPhu6CE2p6XUrooe6M9887EWsWUvcAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oxp4O+oPwoBJT9zjdbiDX0HxXhjJheRluBYWA3h5BgYvqc/iv0cnigZq97/38aY0d k7eAKJ9xuHosfcneKiUuLmWzMYZHt+8TCxUP2yqsRXp6pbt4xJqOfBY4N5zJbr86e+ sOqQXuDr2ZjPtbCG3UkaqPwJF/Yu0YUmr1Eo17g8= From: Andy Lutomirski To: linux-nvme@lists.infradead.org Subject: [PATCH 2/4] fabrics: Rename nvmf_hostnqn_file() to nvmf_hostnqn_load() Date: Thu, 19 Dec 2019 19:31:03 -0800 Message-Id: <99abbf25acb4659010d66fee63bd0924032bb0da.1576726427.git.luto@kernel.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191219_193119_996567_0A66BAB9 X-CRM114-Status: UNSURE ( 9.21 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andy Lutomirski Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org The old name was confusing, since the value didn't necessarily come from a file. Signed-off-by: Andy Lutomirski --- fabrics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fabrics.c b/fabrics.c index 12be2e73986e..4448416f9855 100644 --- a/fabrics.c +++ b/fabrics.c @@ -721,7 +721,7 @@ char *hostnqn_read(void) return NULL; } -static int nvmf_hostnqn_file(void) +static int nvmf_hostnqn_load(void) { cfg.hostnqn = hostnqn_read(); @@ -827,7 +827,7 @@ static int build_options(char *argstr, int max_len, bool discover) add_argument(&argstr, &max_len, "traddr", cfg.traddr) || add_argument(&argstr, &max_len, "host_traddr", cfg.host_traddr) || add_argument(&argstr, &max_len, "trsvcid", cfg.trsvcid) || - ((cfg.hostnqn || nvmf_hostnqn_file()) && + ((cfg.hostnqn || nvmf_hostnqn_load()) && add_argument(&argstr, &max_len, "hostnqn", cfg.hostnqn)) || ((cfg.hostid || nvmf_hostid_file()) && add_argument(&argstr, &max_len, "hostid", cfg.hostid)) || -- 2.23.0 _______________________________________________ linux-nvme mailing list linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme