From 56c485995aa75f6e60fa3f3b049779f28131c81d Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 22 Jun 2009 15:09:14 -0400
Subject: [PATCH] --- yaml --- r: 153834 b: refs/heads/master c:
 0b75b35c7cad33e7613f5adf28fa10fe8b09b1c3 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/nfs/namespace.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0c99f4a81e9e..83da5e3ee6c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c02d7adf8c5429727a98bad1d039bccad4c61c50
+refs/heads/master: 0b75b35c7cad33e7613f5adf28fa10fe8b09b1c3
diff --git a/trunk/fs/nfs/namespace.c b/trunk/fs/nfs/namespace.c
index f01caec84463..40c766782891 100644
--- a/trunk/fs/nfs/namespace.c
+++ b/trunk/fs/nfs/namespace.c
@@ -65,6 +65,11 @@ char *nfs_path(const char *base,
 		dentry = dentry->d_parent;
 	}
 	spin_unlock(&dcache_lock);
+	if (*end != '/') {
+		if (--buflen < 0)
+			goto Elong;
+		*--end = '/';
+	}
 	namelen = strlen(base);
 	/* Strip off excess slashes in base string */
 	while (namelen > 0 && base[namelen - 1] == '/')