From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nathan Scott Date: Fri, 17 Oct 2003 01:56:09 +0000 Subject: Re: IA64 ino_t incorrectly sized? MIME-Version: 1 Content-Type: multipart/mixed; boundary="YD3LsXFS42OYHhNZ" Message-Id: List-Id: References: In-Reply-To: To: linux-ia64@vger.kernel.org --YD3LsXFS42OYHhNZ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline hi Neil, On Fri, Oct 17, 2003 at 10:47:14AM +1000, Neil Brown wrote: > I don't really want __kernel_old_ino_t as it would clutter every arch > just for nfsd, and just for 2.6. OK sounds good, although we'd like these changes in 2.4 too (eventually). Do these patches look acceptable? thanks. -- Nathan --YD3LsXFS42OYHhNZ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="nfsd-ia64-ino_t-2.6.patch" --- /usr/tmp/TmpDir.1899229-0/linux/include/linux/nfsd/syscall.h_1.11 Fri Oct 17 11:42:05 2003 +++ linux/include/linux/nfsd/syscall.h Fri Oct 17 11:13:35 2003 @@ -22,6 +22,16 @@ #include /* + * ABI compatibility type definition for the IA64 __kernel_ino_t. + * This can be removed along with the nfsctl_export syscall (2.7). + */ +#ifdef __ia64__ + typedef unsigned int __nfsd_ino_t; +#else + typedef __kernel_ino_t __nfsd_ino_t; +#endif + +/* * Version of the syscall interface */ #define NFSCTL_VERSION 0x0201 @@ -60,7 +70,7 @@ char ex_client[NFSCLNT_IDMAX+1]; char ex_path[NFS_MAXPATHLEN+1]; __kernel_old_dev_t ex_dev; - __kernel_ino_t ex_ino; + __nfsd_ino_t ex_ino; int ex_flags; __kernel_uid_t ex_anon_uid; __kernel_gid_t ex_anon_gid; --YD3LsXFS42OYHhNZ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="nfsd-ia64-ino_t-2.4.patch" --- /usr/tmp/TmpDir.1959-0/linux/include/linux/nfsd/syscall.h_1.6 Fri Oct 17 11:56:38 2003 +++ linux/include/linux/nfsd/syscall.h Fri Oct 17 11:56:14 2003 @@ -22,6 +22,17 @@ #include /* + * ABI compatibility type definition for the IA64 __kernel_ino_t. + * This can be removed along with the nfsctl_export syscall (2.7) + * and the nfsctl_fhparm syscall (2.5). + */ +#ifdef __ia64__ + typedef unsigned int __nfsd_ino_t; +#else + typedef __kernel_ino_t __nfsd_ino_t; +#endif + +/* * Version of the syscall interface */ #define NFSCTL_VERSION 0x0201 @@ -60,7 +71,7 @@ char ex_client[NFSCLNT_IDMAX+1]; char ex_path[NFS_MAXPATHLEN+1]; __kernel_dev_t ex_dev; - __kernel_ino_t ex_ino; + __nfsd_ino_t ex_ino; int ex_flags; __kernel_uid_t ex_anon_uid; __kernel_gid_t ex_anon_gid; @@ -81,7 +92,7 @@ struct nfsctl_fhparm { struct sockaddr gf_addr; __kernel_dev_t gf_dev; - __kernel_ino_t gf_ino; + __nfsd_ino_t gf_ino; int gf_version; }; --YD3LsXFS42OYHhNZ--