diff mbox

nfs: use canonical path in nfs_show_devname

Message ID 1927160445.21851828.1408504000719.JavaMail.zimbra@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Murphy Zhou Aug. 20, 2014, 3:06 a.m. UTC
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.

Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
 fs/nfs/super.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ben Hutchings Aug. 20, 2014, 11:10 p.m. UTC | #1
On Tue, 2014-08-19 at 23:06 -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.
> 
> Signed-off-by: Xiong Zhou <xzhou@redhat.com>
> ---
>  fs/nfs/super.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/nfs/super.c b/fs/nfs/super.c
> index e4499d5..62b1cab 100644
> --- a/fs/nfs/super.c
> +++ b/fs/nfs/super.c
> @@ -780,7 +780,7 @@ int nfs_show_devname(struct seq_file *m, struct dentry *root)
>  	int err = 0;
>  	if (!page)
>  		return -ENOMEM;
> -	devname = nfs_path(&dummy, root, page, PAGE_SIZE, 0);
> +	devname = nfs_path(&dummy, root, page, PAGE_SIZE, 1);
>  	if (IS_ERR(devname))
>  		err = PTR_ERR(devname);
>  	else

This will reintroduce the problem reported in
<https://bugs.debian.org/669314>.

Ben.
diff mbox

Patch

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index e4499d5..62b1cab 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -780,7 +780,7 @@  int nfs_show_devname(struct seq_file *m, struct dentry *root)
 	int err = 0;
 	if (!page)
 		return -ENOMEM;
-	devname = nfs_path(&dummy, root, page, PAGE_SIZE, 0);
+	devname = nfs_path(&dummy, root, page, PAGE_SIZE, 1);
 	if (IS_ERR(devname))
 		err = PTR_ERR(devname);
 	else