From mboxrd@z Thu Jan 1 00:00:00 1970 From: Trond Myklebust Subject: [PATCH attempt=3 4/5] NFS: Fix nfs_path() to always return a '/' at the beginning of the path Date: Sat, 20 Jun 2009 15:33:45 -0400 Message-ID: <20090620193345.14142.8297.stgit@heimdal.trondhjem.org> References: <20090620193344.14142.22774.stgit@heimdal.trondhjem.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org To: Al Viro , Linus Torvalds , Christoph Hellwig Return-path: Received: from mx2.netapp.com ([216.240.18.37]:60581 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751918AbZFTTg6 (ORCPT ); Sat, 20 Jun 2009 15:36:58 -0400 In-Reply-To: <20090620193344.14142.22774.stgit@heimdal.trondhjem.org> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Signed-off-by: Trond Myklebust --- fs/nfs/namespace.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c index f01caec..40c7667 100644 --- a/fs/nfs/namespace.c +++ b/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] == '/')