From: Dave Reisner <d@falconindy.com>
Date: Mon, 26 Dec 2011 23:47:24 +0000 (-0500)
Subject: mount: don't canonicalize the source of a pseudofs
X-Git-Tag: v2.21-rc1~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46c59b51196d4e3f4fe3e4418f6f33d2f0d485d8;p=thirdparty%2Futil-linux.git

mount: don't canonicalize the source of a pseudofs

In line with previous patches, the source of a pseudofs is strictly
semantic; do not attempt to resolve it to a filesystem path.

As a side effect of this, nspec needs to be initialized to NULL since
it may not be assigned null by spec_to_devname when the FS is deemed
a pseudofs.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
---

diff --git a/mount/mount.c b/mount/mount.c
index a18b2df87d..57c0f59776 100644
--- a/mount/mount.c
+++ b/mount/mount.c
@@ -2033,7 +2033,7 @@ is_existing_file (const char *s) {
 static int
 mount_one (const char *spec, const char *node, const char *types,
 	   const char *fstabopts, char *cmdlineopts, int freq, int pass) {
-	const char *nspec;
+	const char *nspec = NULL;
 	char *opts;
 
 	/* Substitute values in opts, if required */
@@ -2063,7 +2063,8 @@ mount_one (const char *spec, const char *node, const char *types,
 			      strncmp(types, "nfs", 3) &&
 			      strncmp(types, "cifs", 4) &&
 			      strncmp(types, "smbfs", 5))) {
-		nspec = spec_to_devname(spec);
+		if (!is_pseudo_fs(types))
+			nspec = spec_to_devname(spec);
 		if (nspec)
 			spec = nspec;
 	}