]>
Commit | Line | Data |
---|---|---|
22ab1e18 JR |
1 | --- util-linux-2.10m/mount/nfs_mount4.h.compat Sun Apr 16 14:48:48 2000 |
2 | +++ util-linux-2.10m/mount/nfs_mount4.h Thu Jun 29 20:51:22 2000 | |
3 | @@ -4,11 +4,16 @@ | |
4 | * Thus, if necessary we teach nfsmount.c the structure of new fields | |
5 | * that will come later. | |
6 | * | |
7 | - * Moreover, the new kernel includes conflict with glibc includes | |
8 | - * so it is easiest to ignore the kernel altogether (at compile time). | |
9 | */ | |
10 | ||
11 | +#include "nfs_mountversion.h" | |
12 | + | |
13 | #define NFS_MOUNT_VERSION 4 | |
14 | + | |
15 | +#if KERNEL_NFS_MOUNT_VERSION >= 4 | |
16 | +#define NFS_FHSIZE 32 | |
17 | +#define NFS_PORT 2049 | |
18 | +#endif | |
19 | ||
20 | struct nfs2_fh { | |
21 | char data[32]; | |
22 | --- util-linux-2.10m/mount/Makefile.compat Thu Jun 29 20:49:43 2000 | |
23 | +++ util-linux-2.10m/mount/Makefile Thu Jun 29 20:50:23 2000 | |
24 | @@ -108,7 +108,10 @@ nfsmount.h nfsmount_xdr.c nfsmount_clnt. | |
25 | cp $(RPCSVCDIR)/nfsmount_clnt.c . | |
26 | endif | |
27 | ||
28 | -nfsmount.o: nfs_mount4.h | |
29 | +nfsmount.o: nfs_mount4.h nfs_mountversion.h | |
30 | + | |
31 | +nfs_mountversion.h: /usr/include/linux/nfs_mount.h | |
32 | + grep NFS_MOUNT_VERSION $< | sed -e 's/NFS/KERNEL_NFS/' > $@ | |
33 | ||
34 | swapargs.h: | |
35 | sh swap.configure |