linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Fix __d_path for lazy unmounts
@ 2010-02-20 12:27 john.johansen
  2010-02-22 17:24 ` John Johansen
                   ` (3 more replies)
  0 siblings, 4 replies; 11+ messages in thread
From: john.johansen @ 2010-02-20 12:27 UTC (permalink / raw)
  To: linux-kernel; +Cc: linux-fsdevel, John Johansen

From: John Johansen <john.johansen@canonical.com>

When __d_path() hits a lazily unmounted mount point, it tries to prepend
the name of the lazily unmounted dentry to the path name.  It gets this wrong,
and also overwrites the slash that separates the name from the following
pathname component. This patch fixes that; if a process was in directory
/foo/bar and /foo got lazily unmounted, the old result was ``foobar'' (note the
missing slash), while the new result with this patch is ``/foo/bar''.

Signed-off-by: John Johansen <john.johansen@canonical.com>
---
 fs/dcache.c |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/fs/dcache.c b/fs/dcache.c
index 953173a..df49666 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1922,11 +1922,9 @@ char *__d_path(const struct path *path, struct path *root,
 	retval = end-1;
 	*retval = '/';
 
-	for (;;) {
+	while(dentry != root->dentry || vfsmnt != root->mnt) {
 		struct dentry * parent;
 
-		if (dentry == root->dentry && vfsmnt == root->mnt)
-			break;
 		if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
 			/* Global root? */
 			if (vfsmnt->mnt_parent == vfsmnt) {
@@ -1950,9 +1948,30 @@ out:
 	return retval;
 
 global_root:
-	retval += 1;	/* hit the slash */
+	/*
+	 * We went past the (vfsmount, dentry) we were looking for and have
+	 * either hit a root dentry, a lazily unmounted dentry, an
+	 * unconnected dentry, or the file is on a pseudo filesystem.
+	 */
+	if ((dentry->d_sb->s_flags & MS_NOUSER) ||
+	    (dentry->d_name.len = 1 && *dentry->d_name.name == '/')) {
+		/*
+		 * Historically, we also glue together the root dentry and
+		 * remaining name for pseudo filesystems like pipefs, which
+		 * have the MS_NOUSER flag set. This results in pathnames
+		 * like "pipe:[439336]".
+		 */
+		retval += 1;	/* overwrite the slash */
+		buflen++;
+	}
 	if (prepend_name(&retval, &buflen, &dentry->d_name) != 0)
 		goto Elong;
+
+	/* connect lazily unmounted mount point */
+	if (*retval != '/' && !(dentry->d_sb->s_flags & MS_NOUSER) &&
+	    prepend(&retval, &buflen, "/", 1) != 0)
+		goto Elong;
+
 	root->mnt = vfsmnt;
 	root->dentry = dentry;
 	goto out;
-- 
1.6.6.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2010-03-01 10:05 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-02-20 12:27 [PATCH] Fix __d_path for lazy unmounts john.johansen
2010-02-22 17:24 ` John Johansen
2010-02-22 17:38 ` Serge E. Hallyn
2010-02-23  0:17 ` Andrew Morton
2010-02-23  1:04   ` Serge E. Hallyn
2010-02-24  0:12     ` [Patch 0/1] Fix __d_path for lazy unmounts v2 john.johansen
2010-02-24  0:12     ` [PATCH] Fix __d_path for lazy unmounts john.johansen
2010-02-23  1:56   ` John Johansen
2010-02-26 12:07 ` Miklos Szeredi
2010-02-26 17:07   ` John Johansen
2010-03-01 10:05     ` Miklos Szeredi

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).