From patchwork Fri Jul 29 00:00:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 9251807 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E138C60757 for ; Fri, 29 Jul 2016 00:00:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C6E4227F4B for ; Fri, 29 Jul 2016 00:00:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB34427F80; Fri, 29 Jul 2016 00:00:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 219E627F4B for ; Fri, 29 Jul 2016 00:00:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752179AbcG2AA2 (ORCPT ); Thu, 28 Jul 2016 20:00:28 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:36669 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752149AbcG2AA1 (ORCPT ); Thu, 28 Jul 2016 20:00:27 -0400 Received: by mail-pa0-f54.google.com with SMTP id pp5so25284593pac.3 for ; Thu, 28 Jul 2016 17:00:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=date:from:to:subject:message-id:user-agent:mime-version :content-transfer-encoding; bh=HXGn+BkcTUMjryAdVXkFVyf+bmTb0kgEsTtW6DEj+Jc=; b=clQlV8/Af0oOBhAoRJTbbIbaJg3vsidX1RyYLiySh/u4yvYRJSMazk8Npj149vZOsD nD4H6kEKrWVTU1QoRFnWXQIDsd9Bqfyg+Fg0dyza34TE/mJ558Pe4AQCVQs9+/1mLsE8 4VVoVqyjrsglsgGc6XFXiuxfas4n6PC/Psu6M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:user-agent :mime-version:content-transfer-encoding; bh=HXGn+BkcTUMjryAdVXkFVyf+bmTb0kgEsTtW6DEj+Jc=; b=kI7eU65DLf+VHijwoLaDGBd72Z3xzKGvxippz4xHN6epNwC2Tp/Au12jG875hnryB6 Pk3I/trGtUkswkaYeltGBaNkiM/kbSvYv9z4itSFqfSYs2LuhrJ4IAWFGd6j8vlagE9u J/dLrKrKZ9th+nTMNExY6mQsaWJSGLc+swVizbJeb/UW7mf6rZdSclSec+5Rt+v9rGTT zwMfG1RA8JKJuoM8gOImLf0CfLEdRSS+VR04S+xEPdjjlPGM1BdREUYXWWeY/BdctRNH LWoMJmU1G6YjPqWO7eJHggTXipPYG5UD9nY9FqljgEB1r6A/vsagEUCuXXiM1sBFh7// cGHA== X-Gm-Message-State: AEkoouuKhe9XGYHl2XUJrvWy77vwFjW6OaYbImrUWGOQsvdrP5n/4k/S2k0QXdfulvYz05g5 X-Received: by 10.66.216.70 with SMTP id oo6mr63091109pac.39.1469750426517; Thu, 28 Jul 2016 17:00:26 -0700 (PDT) Received: from flash ([192.19.245.250]) by smtp.gmail.com with ESMTPSA id p75sm19687762pfa.71.2016.07.28.17.00.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jul 2016 17:00:26 -0700 (PDT) Date: Thu, 28 Jul 2016 17:00:25 -0700 From: james.smart@broadcom.com (James Smart) To: linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org Subject: [PATCH 1/3] nvme-fabrics: rework nvmf_get_address() for variable options Message-ID: <579a9c99.RE/wCYn5/6zl6dPY%james.smart@broadcom.com> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Revise nvmf_get_address() string to account for not all options being present. Signed-off-by: James Smart Acked-by: Johannes Thumshirn Reviewed-by: Christoph Hellwig --- drivers/nvme/host/fabrics.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c index dc99676..2867b92 100644 --- a/drivers/nvme/host/fabrics.c +++ b/drivers/nvme/host/fabrics.c @@ -109,8 +109,16 @@ static void nvmf_host_put(struct nvmf_host *host) */ int nvmf_get_address(struct nvme_ctrl *ctrl, char *buf, int size) { - return snprintf(buf, size, "traddr=%s,trsvcid=%s\n", - ctrl->opts->traddr, ctrl->opts->trsvcid); + int len = 0; + + if (ctrl->opts->mask & NVMF_OPT_TRADDR) + len += snprintf(buf, size, "traddr=%s", ctrl->opts->traddr); + if (ctrl->opts->mask & NVMF_OPT_TRSVCID) + len += snprintf(buf + len, size - len, "%strsvcid=%s", + (len) ? "," : "", ctrl->opts->trsvcid); + len += snprintf(buf + len, size - len, "\n"); + + return len; } EXPORT_SYMBOL_GPL(nvmf_get_address);