summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-03-13 21:20:47 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-14 07:57:18 -0800
commitc12e87f4652b1ba3be168b4f63a440399b941928 (patch)
treeaa8c0ca6a6ea60042975d1ec9437620269df0182
parent712917d1c002f820b177683f4fd491289bde3c32 (diff)
downloadlinux-3.10-c12e87f4652b1ba3be168b4f63a440399b941928.tar.gz
linux-3.10-c12e87f4652b1ba3be168b4f63a440399b941928.tar.bz2
linux-3.10-c12e87f4652b1ba3be168b4f63a440399b941928.zip
[PATCH] NFSv4: fix mount segfault on errors returned that are < -1000
It turns out that nfs4_proc_get_root() may return raw NFSv4 errors instead of mapping them to kernel errors. Problem spotted by Neil Horman <nhorman@tuxdriver.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/nfs/nfs4proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 984ca3454d0..f8c0066e02e 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1430,7 +1430,7 @@ static int nfs4_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,
if (status == 0)
status = nfs4_do_fsinfo(server, fhandle, info);
out:
- return status;
+ return nfs4_map_errors(status);
}
static int _nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr)