[PATCH] mount: avoid canonicalizing pseudofs paths

[PATCH] mount: avoid canonicalizing pseudofs paths

[Dave Reisner]

This fixes a display bug in the new mount wherein a psuedofs existing in
$PWD by name will be resolved and shown as a real mount point.

  $ cd /tmp; mkdir nfsd; mount | grep nfsd
  /tmp/nfsd on /proc/fs/nfsd type nfsd (rw,relatime)

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
---
 sys-utils/mount.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index 81ccb41..0964828 100644
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -146,13 +146,14 @@ static void print_all(struct libmnt_context *cxt, char *pattern, int show_label)
 		const char *type = mnt_fs_get_fstype(fs);
 		const char *src = mnt_fs_get_source(fs);
 		const char *optstr = mnt_fs_get_options(fs);
-		char *xsrc;
+		char *xsrc = NULL;
 
 		if (type && pattern && !mnt_match_fstype(type, pattern))
 			continue;
 
-		xsrc = mnt_pretty_path(src, cache);
-		printf ("%s on %s", xsrc, mnt_fs_get_target(fs));
+		if (!mnt_fs_is_pseudofs(fs))
+			xsrc = mnt_pretty_path(src, cache);
+		printf ("%s on %s", xsrc ? xsrc : src, mnt_fs_get_target(fs));
 		if (type)
 			printf (" type %s", type);
 		if (optstr)
-- 
1.7.8.3

Re: [PATCH] mount: avoid canonicalizing pseudofs paths

[Karel Zak]

On Mon, Jan 16, 2012 at 08:17:55PM -0500, Dave Reisner wrote:
> This fixes a display bug in the new mount wherein a psuedofs existing in
> $PWD by name will be resolved and shown as a real mount point.

 Cool, we really need to test the code.

>   $ cd /tmp; mkdir nfsd; mount | grep nfsd
>   /tmp/nfsd on /proc/fs/nfsd type nfsd (rw,relatime)
> 
> Signed-off-by: Dave Reisner <dreisner@archlinux.org>
> ---
>  sys-utils/mount.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)

 Applied, thanks.

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com