diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/defs.h.in | 6 | ||||
| -rw-r--r-- | include/linux-misc.h | 52 | ||||
| -rw-r--r-- | include/nfs_prot.h | 18 |
3 files changed, 58 insertions, 18 deletions
diff --git a/include/defs.h.in b/include/defs.h.in index ce5f68d..012852e 100644 --- a/include/defs.h.in +++ b/include/defs.h.in @@ -17,10 +17,6 @@ #define DUSER "root" -#ifndef DDIR -# define DDIR "/mnt/psion" -#endif - #ifndef PSIONHOSTNAME # define PSIONHOSTNAME "localhost" #endif @@ -38,6 +34,8 @@ #define DPORT @DPORT@ #define DDRIVE "@DDRIVE@" #define DBASEDIR "@DBASEDIR@" +#define DDIR "@DDIR@" + /* Debugging */ diff --git a/include/linux-misc.h b/include/linux-misc.h new file mode 100644 index 0000000..afe1895 --- /dev/null +++ b/include/linux-misc.h @@ -0,0 +1,52 @@ +/* + * Linux nfs_mount_data version 3 (as expected by mp_mount.c). + * + * We extract it here to avoid some rather nasty fiddling necessary + * to compile with v3 and v4 (the latter as found in the NFS v3 stuff). + */ + +#ifndef LINUX_MISC_H +#define LINUX_MISC_H + +/* + * WARNING! Do not delete or change the order of these fields. If + * a new field is required then add it to the end. The version field + * tracks which fields are present. This will ensure some measure of + * mount-to-kernel version compatibility. Some of these aren't used yet + * but here they are anyway. + */ +#define NFS_MOUNT_VERSION 3 + +struct nfs_mount_data { + int version; /* 1 */ + int fd; /* 1 */ + struct nfs_fh root; /* 1 */ + int flags; /* 1 */ + int rsize; /* 1 */ + int wsize; /* 1 */ + int timeo; /* 1 */ + int retrans; /* 1 */ + int acregmin; /* 1 */ + int acregmax; /* 1 */ + int acdirmin; /* 1 */ + int acdirmax; /* 1 */ + struct sockaddr_in addr; /* 1 */ + char hostname[256]; /* 1 */ + int namlen; /* 2 */ + unsigned int bsize; /* 3 */ +}; + +/* bits in the flags field */ + +#define NFS_MOUNT_SOFT 0x0001 /* 1 */ +#define NFS_MOUNT_INTR 0x0002 /* 1 */ +#define NFS_MOUNT_SECURE 0x0004 /* 1 */ +#define NFS_MOUNT_POSIX 0x0008 /* 1 */ +#define NFS_MOUNT_NOCTO 0x0010 /* 1 */ +#define NFS_MOUNT_NOAC 0x0020 /* 1 */ +#define NFS_MOUNT_TCP 0x0040 /* 2 */ +#define NFS_MOUNT_VER3 0x0080 /* 3 */ +#define NFS_MOUNT_KERBEROS 0x0100 /* 3 */ +#define NFS_MOUNT_NONLM 0x0200 /* 3 */ + +#endif diff --git a/include/nfs_prot.h b/include/nfs_prot.h index 16cc31f..8bc490f 100644 --- a/include/nfs_prot.h +++ b/include/nfs_prot.h @@ -9,7 +9,6 @@ #endif #ifdef linux # include <sys/time.h> -# include <linux/nfs.h> #endif #ifdef __sgi # include <rpc/types.h> @@ -42,7 +41,7 @@ #define NFSMODE_SOCK 0140000 #define NFSMODE_FIFO 0010000 -#if !defined(hpux) && !defined(linux) && !defined(__sgi) +#if !defined(hpux) && !defined(__sgi) enum nfsstat { NFS_OK = 0, NFSERR_PERM = 1, @@ -63,16 +62,12 @@ enum nfsstat { NFSERR_STALE = 70, NFSERR_WFLUSH = 99 }; -#endif /* !hpux, linux */ +#endif /* !hpux, sgi */ -#ifdef linux -typedef enum nfs_stat nfsstat; -#else typedef enum nfsstat nfsstat; -#endif bool_t xdr_nfsstat(); -#if !defined(hpux) && !defined(linux) && !defined(__sgi) +#if !defined(hpux) && !defined(__sgi) enum ftype { NFNON = 0, NFREG = 1, @@ -85,7 +80,7 @@ enum ftype { NFFIFO = 8 }; typedef enum ftype ftype; -#endif /* !linux, hpux */ +#endif /* !hpux, sgi */ #ifdef __sgi typedef enum nfsftype ftype; @@ -94,17 +89,12 @@ typedef enum nfsftype ftype; #ifdef hpux typedef enum nfsftype ftype; #endif -#ifdef linux -typedef enum nfs_ftype ftype; -#endif bool_t xdr_ftype(); -#ifndef linux struct nfs_fh { char data[NFS_FHSIZE]; }; -#endif typedef struct nfs_fh nfs_fh; bool_t xdr_nfs_fh(); |