summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
authorJeff Garzik2006-03-17 01:27:08 +0100
committerJeff Garzik2006-03-17 01:27:08 +0100
commitabc71c46dc0a12ab7fddc18cfe4f4aa26808c79b (patch)
treeb0c846052b994d57d58713a0cc8da30a22baaf1c /fs/nfs/nfs4proc.c
parent[PATCH] drivers/net/e1000/: proper prototypes (diff)
parent[netdrvr] fix array overflows in Chelsio driver (diff)
downloadkernel-qcow2-linux-abc71c46dc0a12ab7fddc18cfe4f4aa26808c79b.tar.gz
kernel-qcow2-linux-abc71c46dc0a12ab7fddc18cfe4f4aa26808c79b.tar.xz
kernel-qcow2-linux-abc71c46dc0a12ab7fddc18cfe4f4aa26808c79b.zip
Merge branch 'upstream-fixes'
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-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 984ca3454d04..f8c0066e02e1 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)