STABLE14-ioctl32-linux26-20050223

FIXES 17669

add ioctl32 support for linux 2.6

(cherry picked from commit 0b1be0bedb8a7e6dcaed6e6f353d46c89966ad21)

diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index df214bbcaa9406d2a56ef12ef14a3b441f32b91b..fc2ec7e459ee47c43974f0c69132f52c9f2943ad 100644 (file)
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -98,6 +98,9 @@ csdbproc_read(char *buffer, char **start, off_t offset, int count,
 }
 
 static struct proc_dir_entry *openafs_procfs;
+#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV)
+static int ioctl32_done;
+#endif
 
 static int
 afsproc_init(void)
@@ -114,6 +117,10 @@ afsproc_init(void)
 
     entry2 = create_proc_read_entry(PROC_CELLSERVDB_NAME, (S_IFREG|S_IRUGO), openafs_procfs, csdbproc_read, NULL);
 
+#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV)
+    if (register_ioctl32_conversion(VIOC_SYSCALL32, NULL) == 0) 
+       ioctl32_done = 1;
+#endif
     return 0;
 }
 
@@ -123,6 +130,10 @@ afsproc_exit(void)
     remove_proc_entry(PROC_CELLSERVDB_NAME, openafs_procfs);
     remove_proc_entry(PROC_SYSCALL_NAME, openafs_procfs);
     remove_proc_entry(PROC_FSDIRNAME, proc_root_fs);
+#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV)
+    if (ioctl32_done)
+           unregister_ioctl32_conversion(VIOC_SYSCALL32);
+#endif
 }
 
 extern asmlinkage long
@@ -136,7 +147,7 @@ afs_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
     struct afsprocdata sysargs;
     struct afsprocdata32 sysargs32;
 
-    if (cmd != VIOC_SYSCALL) return -EINVAL;
+    if (cmd != VIOC_SYSCALL && cmd != VIOC_SYSCALL32) return -EINVAL;
 
 #if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV)
 #ifdef AFS_SPARC64_LINUX24_ENV

diff --git a/src/config/afs_args.h b/src/config/afs_args.h
index 4c2a8f45806828a6cf97a6627fdc3ac45039e44d..1960023af9d7ccaf6bd0277dafad41b029970a80 100644 (file)
--- a/src/config/afs_args.h
+++ b/src/config/afs_args.h
@@ -183,6 +183,7 @@ typedef struct cm_initparams_v1 {
 #define PROC_CELLSERVDB_NAME "CellServDB"
 #define VIOC_SYSCALL_TYPE 'C' 
 #define VIOC_SYSCALL _IOW(VIOC_SYSCALL_TYPE,1,void *)
+#define VIOC_SYSCALL32 _IOW(VIOC_SYSCALL_TYPE,1,int)
  
 struct afsprocdata {
   long param4;