Deleted Added
full compact
nfs_prot_freebsd3.h (83653) nfs_prot_freebsd3.h (119682)
1/*
1/*
2 * Copyright (c) 1997-2001 Erez Zadok
2 * Copyright (c) 1997-2003 Erez Zadok
3 * Copyright (c) 1990 Jan-Simon Pendry
4 * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
5 * Copyright (c) 1990 The Regents of the University of California.
6 * All rights reserved.
7 *
8 * This code is derived from software contributed to Berkeley by
9 * Jan-Simon Pendry at Imperial College, London.
10 *

--- 22 unchanged lines hidden (view full) ---

33 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
34 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
35 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
36 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
37 * SUCH DAMAGE.
38 *
39 * %W% (Berkeley) %G%
40 *
3 * Copyright (c) 1990 Jan-Simon Pendry
4 * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
5 * Copyright (c) 1990 The Regents of the University of California.
6 * All rights reserved.
7 *
8 * This code is derived from software contributed to Berkeley by
9 * Jan-Simon Pendry at Imperial College, London.
10 *

--- 22 unchanged lines hidden (view full) ---

33 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
34 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
35 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
36 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
37 * SUCH DAMAGE.
38 *
39 * %W% (Berkeley) %G%
40 *
41 * $Id: nfs_prot_freebsd3.h,v 1.5.2.1 2001/01/10 03:23:22 ezk Exp $
42 * $FreeBSD: head/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h 83653 2001-09-18 23:34:44Z peter $
41 * $Id: nfs_prot_freebsd3.h,v 1.5.2.6 2003/08/27 19:35:16 ib42 Exp $
42 * $FreeBSD: head/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h 119682 2003-09-02 15:42:57Z mbr $
43 *
44 */
45
46#ifndef _AMU_NFS_PROT_H
47#define _AMU_NFS_PROT_H
48
49/* nfs_prot.h defines struct `nfs_fh3', but it is a ``dmr "unwarranted
50 * chumminess with the C implementation". We need the more complete

--- 15 unchanged lines hidden (view full) ---

66#ifdef HAVE_NFS_NFS_H
67# include <nfsclient/nfs.h>
68# include <nfsserver/nfs.h>
69#endif /* HAVE_NFS_NFS_H */
70#ifdef HAVE_UFS_UFS_UFSMOUNT_H
71# include <ufs/ufs/ufsmount.h>
72#endif /* HAVE_UFS_UFS_UFSMOUNT_H */
73
43 *
44 */
45
46#ifndef _AMU_NFS_PROT_H
47#define _AMU_NFS_PROT_H
48
49/* nfs_prot.h defines struct `nfs_fh3', but it is a ``dmr "unwarranted
50 * chumminess with the C implementation". We need the more complete

--- 15 unchanged lines hidden (view full) ---

66#ifdef HAVE_NFS_NFS_H
67# include <nfsclient/nfs.h>
68# include <nfsserver/nfs.h>
69#endif /* HAVE_NFS_NFS_H */
70#ifdef HAVE_UFS_UFS_UFSMOUNT_H
71# include <ufs/ufs/ufsmount.h>
72#endif /* HAVE_UFS_UFS_UFSMOUNT_H */
73
74/* nfsclient/nfsargs.h was introduced in FreeBSD 5.0, and is needed */
75#ifdef HAVE_NFSCLIENT_NFSARGS_H
76# include <nfsclient/nfsargs.h>
77#endif /* HAVE_NFSCLIENT_NFSARGS_H */
78
74/*
75 * MACROS:
76 */
77#define dr_drok_u diropres
78#define ca_where where
79#define da_fhandle dir
80#define da_name name
81#define dl_entries entries

--- 9 unchanged lines hidden (view full) ---

91#define na_ctime ctime
92#define na_fileid fileid
93#define na_fsid fsid
94#define na_mode mode
95#define na_mtime mtime
96#define na_nlink nlink
97#define na_size size
98#define na_type type
79/*
80 * MACROS:
81 */
82#define dr_drok_u diropres
83#define ca_where where
84#define da_fhandle dir
85#define da_name name
86#define dl_entries entries

--- 9 unchanged lines hidden (view full) ---

96#define na_ctime ctime
97#define na_fileid fileid
98#define na_fsid fsid
99#define na_mode mode
100#define na_mtime mtime
101#define na_nlink nlink
102#define na_size size
103#define na_type type
104#define na_uid uid
99#define ne_cookie cookie
100#define ne_fileid fileid
101#define ne_name name
102#define ne_nextentry nextentry
103#define ns_attr_u attributes
104#define ns_status status
105#define ns_u attrstat_u
106#define nt_seconds seconds

--- 64 unchanged lines hidden (view full) ---

171#ifdef NFSMNT_NFSV3
172
173# define MOUNT_NFS3 "nfs" /* is this right? */
174# define MNTOPT_NFS3 "nfs"
175
176/*
177 * as of 3.0-RELEASE the nfs_fh3 that is defined in the system headers
178 * (or the one generated by rpcgen) lacks the proper full definition,
105#define ne_cookie cookie
106#define ne_fileid fileid
107#define ne_name name
108#define ne_nextentry nextentry
109#define ns_attr_u attributes
110#define ns_status status
111#define ns_u attrstat_u
112#define nt_seconds seconds

--- 64 unchanged lines hidden (view full) ---

177#ifdef NFSMNT_NFSV3
178
179# define MOUNT_NFS3 "nfs" /* is this right? */
180# define MNTOPT_NFS3 "nfs"
181
182/*
183 * as of 3.0-RELEASE the nfs_fh3 that is defined in the system headers
184 * (or the one generated by rpcgen) lacks the proper full definition,
179 * listed below. A special macro (aux/macros/struct_nfs_fh3.m4) searches
185 * listed below. A special macro (m4/macros/struct_nfs_fh3.m4) searches
180 * for this special name before other names.
181 */
182struct nfs_fh3_freebsd3 {
183 u_int fh3_length;
184 union nfs_fh3_u {
185 struct nfs_fh3_i {
186 fhandle_t fh3_i;
187 } nfs_fh3_i;

--- 12 unchanged lines hidden ---
186 * for this special name before other names.
187 */
188struct nfs_fh3_freebsd3 {
189 u_int fh3_length;
190 union nfs_fh3_u {
191 struct nfs_fh3_i {
192 fhandle_t fh3_i;
193 } nfs_fh3_i;

--- 12 unchanged lines hidden ---