From: Xiong Zhou <xzhou@redhat.com>
To: Ben Hutchings <ben@decadent.org.uk>,
trond myklebust <trond.myklebust@primarydata.com>
Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] nfs: remove redundant slash from nfs_path
Date: Mon, 25 Aug 2014 01:51:04 -0400 (EDT) [thread overview]
Message-ID: <1859750321.23735105.1408945864304.JavaMail.zimbra@redhat.com> (raw)
In-Reply-To: <1408576235.2618.47.camel@deadeye.wl.decadent.org.uk>
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--;
--
1.8.3.1
next prev parent reply other threads:[~2014-08-25 5:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <600788954.21849581.1408502615727.JavaMail.zimbra@redhat.com>
2014-08-20 3:06 ` [PATCH] nfs: use canonical path in nfs_show_devname Xiong Zhou
2014-08-20 23:10 ` Ben Hutchings
2014-08-25 5:51 ` Xiong Zhou [this message]
2014-08-25 21:07 ` [PATCH v2] nfs: remove redundant slash from nfs_path Ben Hutchings
2014-08-25 21:17 ` Trond Myklebust
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1859750321.23735105.1408945864304.JavaMail.zimbra@redhat.com \
--to=xzhou@redhat.com \
--cc=ben@decadent.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).