diff options
| author | neilbrown <neilbrown> | 2003-07-03 02:09:15 +0000 |
|---|---|---|
| committer | neilbrown <neilbrown> | 2003-07-03 02:09:15 +0000 |
| commit | 05250b116ba3d9e488e52dfeeddbaab929fbd751 (patch) | |
| tree | f78a29deb97ce5b73285994eadcc44ea878ddb5a /support/include/nfs/nfs.h | |
| parent | 1c4fdb00a0cb5208294d745e7491ce58b153606b (diff) | |
| download | nfs-utils-05250b116ba3d9e488e52dfeeddbaab929fbd751.tar.gz nfs-utils-05250b116ba3d9e488e52dfeeddbaab929fbd751.tar.xz nfs-utils-05250b116ba3d9e488e52dfeeddbaab929fbd751.zip | |
allow compilation against 2.5 headers
Diffstat (limited to 'support/include/nfs/nfs.h')
| -rw-r--r-- | support/include/nfs/nfs.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/support/include/nfs/nfs.h b/support/include/nfs/nfs.h index 937c1be..c7fc42c 100644 --- a/support/include/nfs/nfs.h +++ b/support/include/nfs/nfs.h @@ -58,11 +58,22 @@ struct nfsctl_client { unsigned char cl_fhkey[NFSCLNT_KEYMAX]; }; +/* IN 2.5.6? __kernel_dev_t changed size, and __kernel_old_dev_t was left + * with the old value. We need to make sure we use the right one. + * + */ +#include <linux/version.h> +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,70) +# define __nfsd_dev_t __kernel_old_dev_t +#else +# define __nfsd_dev_t __kernel_dev_t +#endif + /* EXPORT/UNEXPORT */ struct nfsctl_export { char ex_client[NFSCLNT_IDMAX+1]; char ex_path[NFS_MAXPATHLEN+1]; - __kernel_dev_t ex_dev; + __nfsd_dev_t ex_dev; __kernel_ino_t ex_ino; int ex_flags; __kernel_uid_t ex_anon_uid; @@ -83,7 +94,7 @@ struct nfsctl_uidmap { /* GETFH */ struct nfsctl_fhparm { struct sockaddr gf_addr; - __kernel_dev_t gf_dev; + __nfsd_dev_t gf_dev; __kernel_ino_t gf_ino; int gf_version; }; |