Re: IA64 ino_t incorrectly sized?

[Nathan Scott <nathans@sgi.com>]

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

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

[-- Attachment #2: nfsd-ia64-ino_t-2.6.patch --]
[-- Type: text/plain, Size: 792 bytes --]

--- /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 <linux/nfsd/auth.h>
 
 /*
+ * 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;

[-- Attachment #3: nfsd-ia64-ino_t-2.4.patch --]
[-- Type: text/plain, Size: 997 bytes --]

--- /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 <linux/nfsd/auth.h>
 
 /*
+ * 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;
 };