Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some more errno remapping: if the NFS server is unreachable because we have 

no route to it, assume there are no quotas. While this might sound like
an impossible scenario, it actually happens inside rump tests when we have
a virtual shmif network but are querying quotas for / which happens to
be on NFS (but of course outside of the shmif setup).
This fixes tests/fs/nfs/t_rquotad on diskless clients.
This commit is contained in:
martin 2014-06-11 08:43:01 +00:00
parent b57ed5cec0
commit eb04decfe5
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/libquota/quota_nfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: quota_nfs.c,v 1.3 2014/06/05 13:14:23 martin Exp $ */
/* $NetBSD: quota_nfs.c,v 1.4 2014/06/11 08:43:01 martin Exp $ */
/*-
* Copyright (c) 2011 Manuel Bouyer
* All rights reserved.
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: quota_nfs.c,v 1.3 2014/06/05 13:14:23 martin Exp $");
__RCSID("$NetBSD: quota_nfs.c,v 1.4 2014/06/11 08:43:01 martin Exp $");
#include <sys/types.h>
#include <sys/param.h> /* XXX for DEV_BSIZE */
@ -191,9 +191,21 @@ __quota_nfs_get(struct quotahandle *qh, const struct quotakey *qk,
free(host);
if (ret != RPC_SUCCESS) {
/* if the file server does not support any quotas at all,
return ENOENT */
errno = sverrno == ENOTCONN ? ENOENT : sverrno;
/*
* Remap some error codes for callers convenience:
* - if the file server does not support any quotas at all,
* return ENOENT
* - if the server can not be reached something is very
* wrong - or we are run inside a virtual rump network
* but querying an NFS mount from the host. Make sure
* to fail silently and return ENOENT as well.
*/
if (ret == RPC_SYSTEMERROR
&& rpc_createerr.cf_error.re_errno == EHOSTUNREACH)
sverrno = ENOENT;
else if (sverrno == ENOTCONN)
sverrno = ENOENT;
errno = sverrno;
return -1;
}