Skip to content

Commit

Permalink
NFSv4: Don't require that NFSv4 mount paths begin with '/'
Browse files Browse the repository at this point in the history
Addresses the regression noted in
  http://bugzilla.linux-nfs.org/show_bug.cgi?id=134

Also mark a couple of other regressions as requiring fixing.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Feb 3, 2007
1 parent c79ba78 commit faebf4e
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions fs/nfs/getroot.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,17 +135,15 @@ int nfs4_path_walk(struct nfs_server *server,
struct nfs_fh lastfh;
struct qstr name;
int ret;
//int referral_count = 0;

dprintk("--> nfs4_path_walk(,,%s)\n", path);

fsinfo.fattr = &fattr;
nfs_fattr_init(&fattr);

if (*path++ != '/') {
dprintk("nfs4_get_root: Path does not begin with a slash\n");
return -EINVAL;
}
/* Eat leading slashes */
while (*path == '/')
path++;

/* Start by getting the root filehandle from the server */
ret = server->nfs_client->rpc_ops->getroot(server, mntfh, &fsinfo);
Expand All @@ -160,6 +158,7 @@ int nfs4_path_walk(struct nfs_server *server,
return -ENOTDIR;
}

/* FIXME: It is quite valid for the server to return a referral here */
if (fattr.valid & NFS_ATTR_FATTR_V4_REFERRAL) {
printk(KERN_ERR "nfs4_get_root:"
" getroot obtained referral\n");
Expand Down Expand Up @@ -187,6 +186,7 @@ int nfs4_path_walk(struct nfs_server *server,
goto eat_dot_dir;
}

/* FIXME: Why shouldn't the user be able to use ".." in the path? */
if (path[0] == '.' && path[1] == '.' && (path[2] == '/' || !path[2])
) {
printk(KERN_ERR "nfs4_get_root:"
Expand All @@ -212,6 +212,7 @@ int nfs4_path_walk(struct nfs_server *server,
return -ENOTDIR;
}

/* FIXME: Referrals are quite valid here too */
if (fattr.valid & NFS_ATTR_FATTR_V4_REFERRAL) {
printk(KERN_ERR "nfs4_get_root:"
" lookupfh obtained referral\n");
Expand Down

0 comments on commit faebf4e

Please sign in to comment.