d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't #include <nfs/nfs.h> in <nfs/nfs_node.h> if KERNEL is defined.

Browse Source 
Fixed everything that depended on the nested include.
This commit is contained in:
Bruce Evans 1997-10-28 14:06:25 +00:00
parent b34683ca29
commit 3b67b033e1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=30808
10 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/nfs/nfs_common.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94
* $Id: nfs_subs.c,v 1.43 1997/09/21 04:23:51 dyson Exp $
* $Id: nfs_subs.c,v 1.44 1997/10/26 20:13:52 phk Exp $
*/
/*
@ -65,8 +65,8 @@
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfsnode.h>
#include <nfs/nfs.h>
#include <nfs/nfsnode.h>
#include <nfs/xdr_subs.h>
#include <nfs/nfsm_subs.h>
#include <nfs/nfsmount.h>

3
sys/nfs/nfs_node.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_node.c 8.6 (Berkeley) 5/22/95
* $Id: nfs_node.c,v 1.20 1997/10/11 18:31:34 phk Exp $
* $Id: nfs_node.c,v 1.21 1997/10/12 20:25:40 phk Exp $
*/
@ -48,6 +48,7 @@
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfs.h>
#include <nfs/nfsnode.h>
#include <nfs/nfsmount.h>

4
sys/nfs/nfs_subs.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94
* $Id: nfs_subs.c,v 1.43 1997/09/21 04:23:51 dyson Exp $
* $Id: nfs_subs.c,v 1.44 1997/10/26 20:13:52 phk Exp $
*/
/*
@ -65,8 +65,8 @@
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfsnode.h>
#include <nfs/nfs.h>
#include <nfs/nfsnode.h>
#include <nfs/xdr_subs.h>
#include <nfs/nfsm_subs.h>
#include <nfs/nfsmount.h>

4
sys/nfs/nfs_vfsops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95
* $Id: nfs_vfsops.c,v 1.48 1997/09/10 19:52:26 phk Exp $
* $Id: nfs_vfsops.c,v 1.49 1997/10/12 20:25:49 phk Exp $
*/
#include <sys/param.h>
@ -64,8 +64,8 @@
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfsnode.h>
#include <nfs/nfs.h>
#include <nfs/nfsnode.h>
#include <nfs/nfsmount.h>
#include <nfs/xdr_subs.h>
#include <nfs/nfsm_subs.h>

4
sys/nfs/nfsnode.h
View File

@ -34,14 +34,14 @@
* SUCH DAMAGE.
*
* @(#)nfsnode.h 8.9 (Berkeley) 5/14/95
* $Id: nfsnode.h,v 1.22 1997/10/15 07:42:34 phk Exp $
* $Id: nfsnode.h,v 1.23 1997/10/16 10:49:05 phk Exp $
*/
#ifndef _NFS_NFSNODE_H_
#define _NFS_NFSNODE_H_
#ifndef _NFS_NFS_H_
#if !defined(_NFS_NFS_H_) && !defined(KERNEL)
#include <nfs/nfs.h>
#endif

3
sys/nfsclient/nfs_node.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_node.c 8.6 (Berkeley) 5/22/95
* $Id: nfs_node.c,v 1.20 1997/10/11 18:31:34 phk Exp $
* $Id: nfs_node.c,v 1.21 1997/10/12 20:25:40 phk Exp $
*/
@ -48,6 +48,7 @@
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfs.h>
#include <nfs/nfsnode.h>
#include <nfs/nfsmount.h>

4
sys/nfsclient/nfs_subs.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94
* $Id: nfs_subs.c,v 1.43 1997/09/21 04:23:51 dyson Exp $
* $Id: nfs_subs.c,v 1.44 1997/10/26 20:13:52 phk Exp $
*/
/*
@ -65,8 +65,8 @@
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfsnode.h>
#include <nfs/nfs.h>
#include <nfs/nfsnode.h>
#include <nfs/xdr_subs.h>
#include <nfs/nfsm_subs.h>
#include <nfs/nfsmount.h>

4
sys/nfsclient/nfs_vfsops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95
* $Id: nfs_vfsops.c,v 1.48 1997/09/10 19:52:26 phk Exp $
* $Id: nfs_vfsops.c,v 1.49 1997/10/12 20:25:49 phk Exp $
*/
#include <sys/param.h>
@ -64,8 +64,8 @@
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfsnode.h>
#include <nfs/nfs.h>
#include <nfs/nfsnode.h>
#include <nfs/nfsmount.h>
#include <nfs/xdr_subs.h>
#include <nfs/nfsm_subs.h>

4
sys/nfsclient/nfsnode.h
View File

@ -34,14 +34,14 @@
* SUCH DAMAGE.
*
* @(#)nfsnode.h 8.9 (Berkeley) 5/14/95
* $Id: nfsnode.h,v 1.22 1997/10/15 07:42:34 phk Exp $
* $Id: nfsnode.h,v 1.23 1997/10/16 10:49:05 phk Exp $
*/
#ifndef _NFS_NFSNODE_H_
#define _NFS_NFSNODE_H_
#ifndef _NFS_NFS_H_
#if !defined(_NFS_NFS_H_) && !defined(KERNEL)
#include <nfs/nfs.h>
#endif

4
sys/nfsserver/nfs_srvsubs.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94
* $Id: nfs_subs.c,v 1.43 1997/09/21 04:23:51 dyson Exp $
* $Id: nfs_subs.c,v 1.44 1997/10/26 20:13:52 phk Exp $
*/
/*
@ -65,8 +65,8 @@
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfsnode.h>
#include <nfs/nfs.h>
#include <nfs/nfsnode.h>
#include <nfs/xdr_subs.h>
#include <nfs/nfsm_subs.h>
#include <nfs/nfsmount.h>