Messages in this thread Patch in this message | | | Date | Sat, 23 May 1998 17:20:59 +0200 | From | Okke Timm <> | Subject | Small patch to 2.1.104pre1 to let knfsd compile |
| |
The subject says it all :)
Comments ?
Okke.
diff -ur linux-2.1.104pre1/include/linux/nfsd/nfsfh.h linux-2.1.104pre1-okke/include/linux/nfsd/nfsfh.h --- linux-2.1.104pre1/include/linux/nfsd/nfsfh.h Sat May 23 16:42:04 1998 +++ linux-2.1.104pre1-okke/include/linux/nfsd/nfsfh.h Sat May 23 16:49:49 1998 @@ -13,6 +13,8 @@ #ifndef NFSD_FH_H #define NFSD_FH_H +#ifdef __KERNEL__ +/* Userspace programs shouldn't bother with this */ #include <linux/types.h> #include <linux/string.h> @@ -48,7 +50,6 @@ #define fh_xdev fh_base.fb_xdev #define fh_xino fh_base.fb_xino -#ifdef __KERNEL__ /* * This is the internal representation of an NFS handle used in knfsd. Only in linux-2.1.104pre1-okke/include/linux/nfsd: nfsfh.h~ diff -ur linux-2.1.104pre1/include/linux/nfsd/syscall.h linux-2.1.104pre1-okke/include/linux/nfsd/syscall.h --- linux-2.1.104pre1/include/linux/nfsd/syscall.h Thu May 21 16:13:26 1998 +++ linux-2.1.104pre1-okke/include/linux/nfsd/syscall.h Sat May 23 16:47:59 1998 @@ -12,6 +12,7 @@ #include <linux/config.h> #include <linux/types.h> #include <linux/socket.h> +#include <linux/nfs.h> #include <linux/nfsd/const.h> #include <linux/nfsd/export.h> #include <linux/nfsd/nfsfh.h> @@ -102,12 +103,20 @@ #define ca_debug u.u_debug }; +#ifndef __KERNEL__ +/* Opaque version for userspace programs */ +union nfsctl_res { + struct nfs_fh cr_getfh; + unsigned int cr_debug; +}; + +#else +/* Kernel version */ union nfsctl_res { struct knfs_fh cr_getfh; unsigned int cr_debug; }; -#ifdef __KERNEL__ /* * Kernel syscall implementation. */ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu
| |