diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/fs/nfs/nfs3_srv.c | 9 | ||||
| -rw-r--r-- | usr/src/uts/intel/sys/spl.h | 10 |
2 files changed, 4 insertions, 15 deletions
diff --git a/usr/src/uts/common/fs/nfs/nfs3_srv.c b/usr/src/uts/common/fs/nfs/nfs3_srv.c index 0f3d54ec4c..b10ae94693 100644 --- a/usr/src/uts/common/fs/nfs/nfs3_srv.c +++ b/usr/src/uts/common/fs/nfs/nfs3_srv.c @@ -18,10 +18,11 @@ * * CDDL HEADER END */ + /* + * Copyright 2015 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013 by Delphix. All rights reserved. - * Copyright 2014 Nexenta Systems, Inc. All rights reserved. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -466,8 +467,7 @@ rfs3_lookup(LOOKUP3args *args, LOOKUP3res *resp, struct exportinfo *exi, if (exi != NULL) exi_rele(exi); VN_RELE(vp); - resp->status = NFS3ERR_ACCES; - error = 1; + error = EACCES; } if (tp != NULL) TPC_RELE(tp); @@ -493,8 +493,7 @@ rfs3_lookup(LOOKUP3args *args, LOOKUP3res *resp, struct exportinfo *exi, if (publicfh_flag && exi != NULL) exi_rele(exi); VN_RELE(vp); - resp->status = NFS3ERR_ACCES; - error = 1; + error = EACCES; } } } diff --git a/usr/src/uts/intel/sys/spl.h b/usr/src/uts/intel/sys/spl.h index 9e0619204e..2f74eb31c9 100644 --- a/usr/src/uts/intel/sys/spl.h +++ b/usr/src/uts/intel/sys/spl.h @@ -27,25 +27,15 @@ #ifndef _SYS_SPL_H #define _SYS_SPL_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif /* - * Convert system interrupt priorities (0-7) into a psr for splx. - * In general, the processor priority (0-15) should be 2 times - * the system pririty. - */ -#define pritospl(n) ((n) << 1) - -/* * on x86 platform these are identity functions */ #define ipltospl(n) (n) #define spltoipl(n) (n) -#define spltopri(n) (n) /* * Hardware spl levels |