| nfs_prot_freebsd3.h (131706) | nfs_prot_freebsd3.h (174313) |
|---|---|
| 1/* | 1/* |
| 2 * Copyright (c) 1997-2004 Erez Zadok | 2 * Copyright (c) 1997-2006 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 * --- 20 unchanged lines hidden (view full) --- 31 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 32 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 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 * | 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 * --- 20 unchanged lines hidden (view full) --- 31 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 32 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 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 * | 39 * |
| 40 * File: am-utils/conf/nfs_prot/nfs_prot_freebsd3.h |
|
| 41 * $Id: nfs_prot_freebsd3.h,v 1.5.2.7 2004/01/06 03:15:19 ezk Exp $ | 41 * $Id: nfs_prot_freebsd3.h,v 1.5.2.7 2004/01/06 03:15:19 ezk Exp $ |
| 42 * $FreeBSD: head/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h 131706 2004-07-06 13:16:49Z mbr $ | 42 * $FreeBSD: head/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h 174313 2007-12-05 16:57:05Z obrien $ |
| 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 --- 12 unchanged lines hidden (view full) --- 63#ifdef HAVE_NFS_RPCV2_H 64# include <nfs/rpcv2.h> 65#endif /* HAVE_NFS_RPCV2_H */ 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 | 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 --- 12 unchanged lines hidden (view full) --- 63#ifdef HAVE_NFS_RPCV2_H 64# include <nfs/rpcv2.h> 65#endif /* HAVE_NFS_RPCV2_H */ 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# ifdef HAVE_UFS_UFS_EXTATTR_H 72/* 73 * Define a dummy struct ufs_extattr_per_mount, which is used in struct 74 * ufsmount in <ufs/ufs/ufsmount.h>. 75 */ 76struct ufs_extattr_per_mount; 77# endif /* HAVE_UFS_UFS_EXTATTR_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 --- 95 unchanged lines hidden (view full) --- 174 * macro below. If the code doesn't compile, upgrade to the latest 3.0 175 * version... 176 */ 177#ifdef NFSMNT_NFSV3 178 179# define MOUNT_NFS3 "nfs" /* is this right? */ 180# define MNTOPT_NFS3 "nfs" 181 | 78# include <ufs/ufs/ufsmount.h> 79#endif /* HAVE_UFS_UFS_UFSMOUNT_H */ 80 81/* nfsclient/nfsargs.h was introduced in FreeBSD 5.0, and is needed */ 82#ifdef HAVE_NFSCLIENT_NFSARGS_H 83# include <nfsclient/nfsargs.h> 84#endif /* HAVE_NFSCLIENT_NFSARGS_H */ 85 --- 95 unchanged lines hidden (view full) --- 181 * macro below. If the code doesn't compile, upgrade to the latest 3.0 182 * version... 183 */ 184#ifdef NFSMNT_NFSV3 185 186# define MOUNT_NFS3 "nfs" /* is this right? */ 187# define MNTOPT_NFS3 "nfs" 188 |
| 189# ifndef HAVE_XDR_LOOKUP3RES |
|
| 182/* | 190/* |
| 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, 185 * listed below. A special macro (m4/macros/struct_nfs_fh3.m4) searches 186 * for this special name before other names. | 191 * FreeBSD uses different field names than are defined on most other 192 * systems. |
| 187 */ | 193 */ |
| 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; 194 char data[NFS3_FHSIZE]; 195 } fh3_u; 196}; 197typedef struct nfs_fh3_freebsd3 nfs_fh3_freebsd3; | 194# define AMU_LOOKUP3RES_OK(x) ((x)->LOOKUP3res_u.resok) 195# define AMU_LOOKUP3RES_FAIL(x) ((x)->LOOKUP3res_u.resfail) 196# define AMU_LOOKUP3RES_FH_LEN(x) (AMU_LOOKUP3RES_OK(x).object.data.data_len) 197# define AMU_LOOKUP3RES_FH_DATA(x) (AMU_LOOKUP3RES_OK(x).object.data.data_val) 198# endif /* not HAVE_XDR_LOOKUP3RES */ |
| 198 199/* since we don't use Am-utils's aux/macros/struct_nfs_fh3.m4, we don't get 200 their special searching. So restore the standard name. */ 201typedef struct nfs_fh3_freebsd3 nfs_fh3; 202 203#endif /* NFSMNT_NFSV3 */ 204 205#endif /* not _AMU_NFS_PROT_H */ | 199 200/* since we don't use Am-utils's aux/macros/struct_nfs_fh3.m4, we don't get 201 their special searching. So restore the standard name. */ 202typedef struct nfs_fh3_freebsd3 nfs_fh3; 203 204#endif /* NFSMNT_NFSV3 */ 205 206#endif /* not _AMU_NFS_PROT_H */ |