Received: by 10.223.185.116 with SMTP id b49csp5497869wrg; Wed, 7 Mar 2018 12:50:29 -0800 (PST) X-Google-Smtp-Source: AG47ELsWTwQIdWfW7bSy+lWgpMW0g6BNK4AF7lOF5fKol4beg/qfRRrNsWR6owMEFk/HbX7hK24H X-Received: by 2002:a17:902:3103:: with SMTP id w3-v6mr20659443plb.99.1520455829457; Wed, 07 Mar 2018 12:50:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520455829; cv=none; d=google.com; s=arc-20160816; b=mkBhdovXND2SMmsPDD66YrKQ8ZwZTWh27Ppi5psTd7c3Xz9YlwOm94HLASbmST86eO u3eXIebpsfY2MmhkYetrKPall3VtCYHZ9eAMnyrly1Ih9LQzkespFXp8d+vR8wxz4k4T Wm0lX4c/3XF75h6rfT0cxiuujmhJ1MBH5fd0HV0kzhkIpikn7XVYWlQxbuV9Z0oAuws6 g+rMfJAK59B+35X1aF6mo8ARmV0+SHZcsfQLgLPSOwSpOfI9E9iAFXUUJByWQrzw1bV1 qzrwScejlgDSDPWSQnYcK/8hgDs16Ta5+eZ7nHHK+4rfWYCOLGiYMP5ty/TDKjYO8Nib f2Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-id:content-language:accept-language:in-reply-to:references :message-id:date:thread-index:thread-topic:subject:cc:to:from :arc-authentication-results; bh=1jPzGizo57xrW5NrHxSqU1vY8zp0OMPEJpCs9mjNIn0=; b=Ghk4uoRvOnrYHdvhK3JE8lA1hbyZF7bn/nN1mBDCDzFbrQvgExUqGM9hPW+kRc6mDf PPCMUuUIOtnHAcse5m4AY/VNCU8lDL11Il11IaMTmKWeerNZEaLDd288znOX8PZxrUwl VnbY3nlqAB/k5K9Odqw/ChUyUByeZ0mT+XAzQkEyWWojGlNyZUkz0AUSagfEEWMB1C5a Kh6unA3R9sVol3uLRyHKxHmwcTEv2McPAdBwMkT70U/VzIdj7ee4ZcxeuriR6IIRy603 GO814XOxouCC17IKsIzsDTel9v1greM9H2MYNAQWOXQERzmBcIAuyOSIwUdyl5dVLzou Hq6g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m3-v6si13499992plb.480.2018.03.07.12.50.14; Wed, 07 Mar 2018 12:50:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754757AbeCGUtJ convert rfc822-to-8bit (ORCPT + 99 others); Wed, 7 Mar 2018 15:49:09 -0500 Received: from mga07.intel.com ([134.134.136.100]:2014 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934510AbeCGUtG (ORCPT ); Wed, 7 Mar 2018 15:49:06 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Mar 2018 12:49:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,437,1515484800"; d="scan'208";a="26085698" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga002.fm.intel.com with ESMTP; 07 Mar 2018 12:49:04 -0800 Received: from fmsmsx157.amr.corp.intel.com (10.18.116.73) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 7 Mar 2018 12:49:04 -0800 Received: from FMSMSX109.amr.corp.intel.com ([169.254.15.144]) by FMSMSX157.amr.corp.intel.com ([169.254.14.60]) with mapi id 14.03.0319.002; Wed, 7 Mar 2018 12:49:04 -0800 From: "Dilger, Andreas" To: NeilBrown CC: "Drokin, Oleg" , Greg Kroah-Hartman , James Simmons , "Linux Kernel Mailing List" , Lustre Development List Subject: Re: [PATCH 01/17] staging: lustre: obd_mount: use correct niduuid suffix. Thread-Topic: [PATCH 01/17] staging: lustre: obd_mount: use correct niduuid suffix. Thread-Index: AQHTsbWTgrGGbDRuDketpUA6hpf1WqPFziMA Date: Wed, 7 Mar 2018 20:49:03 +0000 Message-ID: <4F9BD297-F7B5-4F10-B700-2806FAEA9359@intel.com> References: <151994679573.7628.1024109499321778846.stgit@noble> <151994708505.7628.14486515694497834046.stgit@noble> In-Reply-To: <151994708505.7628.14486515694497834046.stgit@noble> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.254.6.233] Content-Type: text/plain; charset="us-ascii" Content-ID: Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mar 1, 2018, at 16:31, NeilBrown wrote: > > Commit 4f016420d368 ("Staging: lustre: obdclass: Use kasprintf") moved > some sprintf() calls earlier in the code to combine them with > memory allocation and create kasprintf() calls. > > In one case, this code movement moved the sprintf to a location where the > values being formatter were different. > In particular > sprintf(niduuid, "%s_%x", mgcname, i); > was move from *after* the line > i = 0; > to a location where the value of 'i' was at least 1. > > This cause the wrong name to be formatted, and triggers > > CERROR("del MDC UUID %s failed: rc = %d\n", > niduuid, rc); > > at unmount time. > > So use '0' instead of 'i'. > > Fixes: 4f016420d368 ("Staging: lustre: obdclass: Use kasprintf") > Signed-off-by: NeilBrown Reviewed-by: Andreas Dilger > --- > drivers/staging/lustre/lustre/obdclass/obd_mount.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/staging/lustre/lustre/obdclass/obd_mount.c b/drivers/staging/lustre/lustre/obdclass/obd_mount.c > index acc1ea773c9c..f5e8214ac37b 100644 > --- a/drivers/staging/lustre/lustre/obdclass/obd_mount.c > +++ b/drivers/staging/lustre/lustre/obdclass/obd_mount.c > @@ -243,7 +243,7 @@ int lustre_start_mgc(struct super_block *sb) > libcfs_nid2str_r(nid, nidstr, sizeof(nidstr)); > mgcname = kasprintf(GFP_NOFS, > "%s%s", LUSTRE_MGC_OBDNAME, nidstr); > - niduuid = kasprintf(GFP_NOFS, "%s_%x", mgcname, i); > + niduuid = kasprintf(GFP_NOFS, "%s_%x", mgcname, 0); > if (!mgcname || !niduuid) { > rc = -ENOMEM; > goto out_free; > > Cheers, Andreas -- Andreas Dilger Lustre Principal Architect Intel Corporation