Re: [PATCH v2] nfs: remove redundant slash from nfs_path

From: Trond Myklebust <trond.myklebust@primarydata.com>
To: Ben Hutchings <ben@decadent.org.uk>
Cc: Xiong Zhou <xzhou@redhat.com>,
	Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
	Linux Kernel mailing list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2] nfs: remove redundant slash from nfs_path
Date: Mon, 25 Aug 2014 17:17:30 -0400	[thread overview]
Message-ID: <CAHQdGtT0WhB38XYToS8ceiepW2v_stKZcVYsktBG26iBS4KHAg@mail.gmail.com> (raw)
In-Reply-To: <1409000826.3033.32.camel@deadeye.wl.decadent.org.uk>

On Mon, Aug 25, 2014 at 5:07 PM, Ben Hutchings <ben@decadent.org.uk> wrote:
> On Mon, 2014-08-25 at 01:51 -0400, Xiong Zhou wrote:
>> When export root dir(/) via nfs, and mount a particular dir under root, eg
>> /nfsexport, there will be defect double slash output in /proc/mounts, like
>> localhost://nfsexport. While this patch change it to localhost:/nfsexport.
>>
>> Signed-off-by: Xiong Zhou <xzhou@redhat.com>
>> ---
>>  fs/nfs/namespace.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
>> index b5a0afc..24f954e 100644
>> --- a/fs/nfs/namespace.c
>> +++ b/fs/nfs/namespace.c
>> @@ -98,7 +98,7 @@ rename_retry:
>>               return end;
>>       }
>>       namelen = strlen(base);
>> -     if (flags & NFS_PATH_CANONICAL) {
>> +     if ((flags & NFS_PATH_CANONICAL) || *end == '/') {
>>               /* Strip off excess slashes in base string */
>>               while (namelen > 0 && base[namelen - 1] == '/')
>>                       namelen--;
>
> I think this makes sense, though I'm not sure I completely understand
> this function. :-/
>

It breaks the function's guarantee concerning NFS_PATH_CANONICAL; that
"if unset, the original name is returned verbatim".

-- 
Trond Myklebust

Linux NFS client maintainer, PrimaryData

trond.myklebust@primarydata.com