linux-updates-20060309
[openafs.git] / src / afs / LINUX / osi_module.c
index 9f4fad7..8718c69 100644 (file)
 #include <afsconfig.h>
 #include "afs/param.h"
 
-RCSID("$Header$");
+RCSID
+    ("$Header$");
 
+#include <linux/module.h> /* early to avoid printf->printk mapping */
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
-#include "h/unistd.h" /* For syscall numbers. */
+#include "h/unistd.h"          /* For syscall numbers. */
 #include "h/mm.h"
 
-#include <linux/module.h>
+#ifdef AFS_AMD64_LINUX20_ENV
+#include <asm/ia32_unistd.h>
+#endif
+#ifdef AFS_SPARC64_LINUX20_ENV
+#include <linux/ioctl32.h>
+#endif
+
+#include <linux/proc_fs.h>
 #include <linux/slab.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 #include <linux/init.h>
 #include <linux/sched.h>
+#include <linux/kernel.h>
 #endif
-#ifndef EXPORTED_SYS_CALL_TABLE
-#include <linux/syscall.h>
-#endif
-
 
-
-#ifdef AFS_SPARC64_LINUX24_ENV
-#define __NR_setgroups32      82 /* This number is not exported for some bizarre reason. */
+#ifdef HAVE_KERNEL_LINUX_SEQ_FILE_H
+#include <linux/seq_file.h>
 #endif
 
-asmlinkage int (*sys_settimeofdayp)(struct timeval *tv, struct timezone *tz);
-asmlinkage long (*sys_setgroupsp)(int gidsetsize, gid_t *grouplist);
-
-#ifdef EXPORTED_SYS_CALL_TABLE
-#ifdef AFS_SPARC64_LINUX20_ENV
-extern unsigned int sys_call_table[];  /* changed to uint because SPARC64 has syscaltable of 32bit items */
-#else
-extern void * sys_call_table[]; /* safer for other linuces */
-#endif
-#else /* EXPORTED_SYS_CALL_TABLE */
-#ifdef AFS_SPARC64_LINUX20_ENV
-static unsigned int *sys_call_table;  /* changed to uint because SPARC64 has syscaltable of 32bit items */
-#else
-static void ** sys_call_table; /* safer for other linuces */
-#endif
-#endif
-extern struct file_system_type afs_file_system;
+extern struct file_system_type afs_fs_type;
 
+#if !defined(AFS_LINUX24_ENV)
 static long get_page_offset(void);
+#endif
 
-#if defined(AFS_LINUX24_ENV)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+DEFINE_MUTEX(afs_global_lock);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 DECLARE_MUTEX(afs_global_lock);
 #else
 struct semaphore afs_global_lock = MUTEX;
 #endif
 int afs_global_owner = 0;
-unsigned long afs_linux_page_offset = 0; /* contains the PAGE_OFFSET value */
-
-/* Since sys_ni_syscall is not exported, I need to cache it in order to restore
- * it.
- */
-#ifdef AFS_SPARC64_LINUX20_ENV
-static unsigned int afs_ni_syscall = 0;
-#else
-static void* afs_ni_syscall = 0;
+#if !defined(AFS_LINUX24_ENV)
+unsigned long afs_linux_page_offset = 0;       /* contains the PAGE_OFFSET value */
 #endif
-#ifdef AFS_SPARC64_LINUX20_ENV
-static unsigned int afs_ni_syscall32 = 0;
-asmlinkage int (*sys32_setgroupsp)(int gidsetsize, __kernel_gid_t32 *grouplist);
-#if defined(__NR_setgroups32)
-asmlinkage int (*sys32_setgroups32p)(int gidsetsize, __kernel_gid_t32 *grouplist);
+
+static inline int afs_ioctl(struct inode *, struct file *, unsigned int,
+                    unsigned long);
+#if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL)
+static long afs_unlocked_ioctl(struct file *, unsigned int, unsigned long);
 #endif
-#ifdef EXPORTED_SYS_CALL_TABLE
-extern unsigned int sys_call_table32[];
+
+static struct file_operations afs_syscall_fops = {
+#ifdef HAVE_UNLOCKED_IOCTL
+    .unlocked_ioctl = afs_unlocked_ioctl,
 #else
-static unsigned int *sys_call_table32;
+    .ioctl = afs_ioctl,
 #endif
+#ifdef HAVE_COMPAT_IOCTL
+    .compat_ioctl = afs_unlocked_ioctl,
+#endif
+};
 
-asmlinkage int afs_syscall32(long syscall, long parm1, long parm2, long parm3,
-                            long parm4, long parm5)
+#ifdef HAVE_KERNEL_LINUX_SEQ_FILE_H
+static void *c_start(struct seq_file *m, loff_t *pos)
 {
-__asm__ __volatile__ ("srl %o4, 0, %o4\n\t"
-                      "mov %o7, %i7\n\t"
-                      "call afs_syscall\n\t"
-                     "srl %o5, 0, %o5\n\t"
-                     "ret\n\t"
-                      "nop");
+       struct afs_q *cq, *tq;
+       loff_t n = 0;
+
+       ObtainReadLock(&afs_xcell);
+       for (cq = CellLRU.next; cq != &CellLRU; cq = tq) {
+               tq = QNext(cq);
+
+               if (n++ == *pos)
+                       break;
+       }
+       if (cq == &CellLRU)
+               return NULL;
+
+       return cq;
 }
-#endif
 
-#ifdef AFS_IA64_LINUX20_ENV
+static void *c_next(struct seq_file *m, void *p, loff_t *pos)
+{
+       struct afs_q *cq = p, *tq;
 
-asmlinkage long
-afs_syscall_stub(int r0, int r1, long r2, long r3, long r4, long gp)
+       (*pos)++;
+       tq = QNext(cq);
+
+       if (tq == &CellLRU)
+               return NULL;
+
+       return tq;
+}
+
+static void c_stop(struct seq_file *m, void *p)
 {
-__asm__ __volatile__ ("alloc r42 = ar.pfs, 8, 3, 6, 0\n\t"
-                      "mov r41 = b0\n\t"                /* save rp */
-                      "mov out0 = in0\n\t"
-                      "mov out1 = in1\n\t"
-                      "mov out2 = in2\n\t"
-                      "mov out3 = in3\n\t"
-                      "mov out4 = in4\n\t"
-                      "mov out5 = gp\n\t"                       /* save gp */
-                      ";;\n"
-                      ".L1:    mov r3 = ip\n\t"
-                      ";;\n\t"
-                      "addl r15=.fptr_afs_syscall-.L1,r3\n\t"
-                      ";;\n\t"
-                      "ld8 r15=[r15]\n\t"
-                      ";;\n\t"
-                      "ld8 r16=[r15],8\n\t"
-                      ";;\n\t"
-                      "ld8 gp=[r15]\n\t"
-                      "mov b6=r16\n\t"
-                      "br.call.sptk.many b0 = b6\n\t"
-                      ";;\n\t"
-                      "mov ar.pfs = r42\n\t"
-                      "mov b0 = r41\n\t"
-                      "mov gp = r48\n\t"                /* restore gp */
-                      "br.ret.sptk.many b0\n"
-                      ".fptr_afs_syscall:\n\t"
-                      "data8 @fptr(afs_syscall)");
+       ReleaseReadLock(&afs_xcell);
 }
 
-asmlinkage long
-afs_xsetgroups_stub(int r0, int r1, long r2, long r3, long r4, long gp)
+static int c_show(struct seq_file *m, void *p)
 {
-__asm__ __volatile__ ("alloc r42 = ar.pfs, 8, 3, 6, 0\n\t"
-                      "mov r41 = b0\n\t"                /* save rp */
-                      "mov out0 = in0\n\t"
-                      "mov out1 = in1\n\t"
-                      "mov out2 = in2\n\t"
-                      "mov out3 = in3\n\t"
-                      "mov out4 = in4\n\t"
-                      "mov out5 = gp\n\t"                       /* save gp */
-                      ";;\n"
-                      ".L2:    mov r3 = ip\n\t"
-                      ";;\n\t"
-                      "addl r15=.fptr_afs_xsetgroups - .L2,r3\n\t"
-                      ";;\n\t"
-                      "ld8 r15=[r15]\n\t"
-                      ";;\n\t"
-                      "ld8 r16=[r15],8\n\t"
-                      ";;\n\t"
-                      "ld8 gp=[r15]\n\t"
-                      "mov b6=r16\n\t"
-                      "br.call.sptk.many b0 = b6\n\t"
-                      ";;\n\t"
-                      "mov ar.pfs = r42\n\t"
-                      "mov b0 = r41\n\t"
-                      "mov gp = r48\n\t"                /* restore gp */
-                      "br.ret.sptk.many b0\n"
-                      ".fptr_afs_xsetgroups:\n\t"
-                      "data8 @fptr(afs_xsetgroups)");
+       struct afs_q *cq = p;
+       struct cell *tc = QTOC(cq);
+       int j;
+
+       seq_printf(m, ">%s #(%d/%d)\n", tc->cellName,
+                  tc->cellNum, tc->cellIndex);
+
+       for (j = 0; j < MAXCELLHOSTS; j++) {
+               afs_uint32 addr;
+
+               if (!tc->cellHosts[j]) break;
+
+               addr = tc->cellHosts[j]->addr->sa_ip;
+               seq_printf(m, "%u.%u.%u.%u #%u.%u.%u.%u\n",
+                          NIPQUAD(addr), NIPQUAD(addr));
+       }
+
+       return 0;
 }
 
-struct fptr
+static struct seq_operations afs_csdb_op = {
+       .start          = c_start,
+       .next           = c_next,
+       .stop           = c_stop,
+       .show           = c_show,
+};
+
+static int afs_csdb_open(struct inode *inode, struct file *file)
 {
-       void *ip;
-       unsigned long gp;
+       return seq_open(file, &afs_csdb_op);
+}
+
+static struct file_operations afs_csdb_operations = {
+       .open           = afs_csdb_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = seq_release,
 };
 
-#endif /* AFS_IA64_LINUX20_ENV */
+#else /* HAVE_KERNEL_LINUX_SEQ_FILE_H */
 
-#ifdef AFS_LINUX24_ENV
-asmlinkage int (*sys_setgroups32p)(int gidsetsize, __kernel_gid32_t *grouplist);
-#endif 
+int
+csdbproc_info(char *buffer, char **start, off_t offset, int
+length)
+{
+    int len = 0;
+    off_t pos = 0;
+    int cnt;
+    struct afs_q *cq, *tq;
+    struct cell *tc;
+    char tbuffer[16];
+    /* 90 - 64 cellname, 10 for 32 bit num and index, plus
+       decor */
+    char temp[91];
+    afs_uint32 addr;
+    
+    ObtainReadLock(&afs_xcell);
+
+    for (cq = CellLRU.next; cq != &CellLRU; cq = tq) {
+        tc = QTOC(cq); tq = QNext(cq);
+
+        pos += 90;
+
+        if (pos <= offset) {
+            len = 0;
+        } else {
+            sprintf(temp, ">%s #(%d/%d)\n", tc->cellName, 
+                    tc->cellNum, tc->cellIndex);
+            sprintf(buffer + len, "%-89s\n", temp);
+            len += 90;
+            if (pos >= offset+length) {
+                ReleaseReadLock(&afs_xcell);
+                goto done;
+            }
+        }
+
+        for (cnt = 0; cnt < MAXCELLHOSTS; cnt++) {
+            if (!tc->cellHosts[cnt]) break;
+            pos += 90;
+            if (pos <= offset) {
+                len = 0;
+            } else {
+                addr = ntohl(tc->cellHosts[cnt]->addr->sa_ip);
+                sprintf(tbuffer, "%d.%d.%d.%d", 
+                        (int)((addr>>24) & 0xff),
+(int)((addr>>16) & 0xff),
+                        (int)((addr>>8)  & 0xff), (int)( addr & 0xff));
+                sprintf(temp, "%s #%s\n", tbuffer, tbuffer);
+                sprintf(buffer + len, "%-89s\n", temp);
+                len += 90;
+                if (pos >= offset+length) {
+                    ReleaseReadLock(&afs_xcell);
+                    goto done;
+                }
+            }
+        }
+    }
 
-#ifdef AFS_SPARC64_LINUX20_ENV
-#define POINTER2SYSCALL (unsigned int)(unsigned long)
-#define SYSCALL2POINTER (void *)(long)
-#else
-#define POINTER2SYSCALL (void *)
-#define SYSCALL2POINTER (void *)
-#endif
+    ReleaseReadLock(&afs_xcell);
+    
+done:
+    *start = buffer + len - (pos - offset);
+    len = pos - offset;
+    if (len > length)
+        len = length;
+    return len;
+}
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-int __init afs_init(void)
-#else
-int init_module(void)
-#endif
+#endif /* HAVE_KERNEL_LINUX_SEQ_FILE_H */
+
+int
+peerproc_read(char *buffer, char **start, off_t offset, int count,
+             int *eof, void *data)
 {
-#if defined(AFS_IA64_LINUX20_ENV)
-    unsigned long kernel_gp;
-    static struct fptr sys_settimeofday, sys_setgroups;
-#endif
-    extern int afs_syscall();
-    extern long afs_xsetgroups();
-#if defined(__NR_setgroups32)
-    extern int afs_xsetgroups32();
-#endif
-#ifdef AFS_SPARC64_LINUX20_ENV
-    extern int afs32_xsetgroups();
-#if defined(__NR_setgroups32)
-    extern int afs32_xsetgroups32();
-#endif
-#endif
+    int len, i, j;
+    struct rx_peer *sep;
+    
+    len = 0;
+    for (i = 0, j = 0; i < 256; i++) {
+        for (sep = rx_peerHashTable[i]; sep; sep = sep->next, j++) {
+           len += sprintf(buffer + len, "%lx: next=0x%lx, host=0x%x, ", (unsigned long)sep,
+                  (unsigned long)sep->next, sep->host);
+            len += sprintf(buffer + len, "ifMTU=%d, natMTU=%d, maxMTU=%d\n", sep->ifMTU,
+                   sep->natMTU, sep->maxMTU);
+            len += sprintf(buffer + len, "\trtt=%d:%d, timeout(%d:%d), nSent=%d, reSends=%d\n",
+                   sep->rtt, sep->rtt_dev, sep->timeout.sec,
+                   sep->timeout.usec, sep->nSent, sep->reSends);
+            len += sprintf(buffer + len, "\trefCount=%d, port=%d, idleWhen=0x%x\n",
+                   sep->refCount, sep->port, sep->idleWhen);
+            len += sprintf(buffer + len, "\tCongestionQueue (0x%lx:0x%lx), inPacketSkew=0x%x, outPacketSkew=0x%x\n",
+                 (unsigned long)sep->congestionQueue.prev, (unsigned long)sep->congestionQueue.next,
+                 sep->inPacketSkew, sep->outPacketSkew);
+#ifdef RX_ENABLE_LOCKS
+            len += sprintf(buffer + len, "\tpeer_lock=%d\n", sep->peer_lock);
+#endif /* RX_ENABLE_LOCKS */
+        }
+    }
+    
+    if (offset >= len) {
+       *start = buffer;
+       *eof = 1;
+       return 0;
+    }
+    *start = buffer + offset;
+    if ((len -= offset) > count)
+       return count;
+    *eof = 1;
+    return len;
+}
 
-#ifndef EXPORTED_SYS_CALL_TABLE
-    unsigned long *ptr;
-    unsigned long offset;
-    unsigned long datalen;
-    int ret;
-    unsigned long token;
-    char      *mod_name;
-    unsigned long    mod_start;
-    unsigned long    mod_end;
-    char      *sec_name;
-    unsigned long    sec_start;
-    unsigned long    sec_end;
-    char      *sym_name;
-    unsigned long    sym_start;
-    unsigned long    sym_end;
-#endif
+int
+rxstatsproc_read(char *buffer, char **start, off_t offset, int count,
+             int *eof, void *data)
+{
+    int len, i;
+    
+    len = 0;
+    len += sprintf(buffer + len, "packetRequests = %d\n", rx_stats.packetRequests);
+    len += sprintf(buffer + len, "noPackets[%d] = %d\n", RX_PACKET_CLASS_RECEIVE,
+           rx_stats.receivePktAllocFailures);
+    len += sprintf(buffer + len, "noPackets[%d] = %d\n", RX_PACKET_CLASS_SEND,
+           rx_stats.sendPktAllocFailures);
+    len += sprintf(buffer + len, "noPackets[%d] = %d\n", RX_PACKET_CLASS_SPECIAL,
+           rx_stats.specialPktAllocFailures);
+    len += sprintf(buffer + len, "noPackets[%d] = %d\n", RX_PACKET_CLASS_RECV_CBUF,
+           rx_stats.receiveCbufPktAllocFailures);
+    len += sprintf(buffer + len, "noPackets[%d] = %d\n", RX_PACKET_CLASS_SEND_CBUF,
+           rx_stats.sendCbufPktAllocFailures);
+    len += sprintf(buffer + len, "socketGreedy = %d\n", rx_stats.socketGreedy);
+    len += sprintf(buffer + len, "bogusPacketOnRead = %d\n", rx_stats.bogusPacketOnRead);
+    len += sprintf(buffer + len, "bogusHost = %d\n", rx_stats.bogusHost);
+    len += sprintf(buffer + len, "noPacketOnRead = %d\n", rx_stats.noPacketOnRead);
+    len += sprintf(buffer + len, "noPacketBuffersOnRead = %d\n",
+           rx_stats.noPacketBuffersOnRead);
+    len += sprintf(buffer + len, "selects = %d\n", rx_stats.selects);
+    len += sprintf(buffer + len, "sendSelects = %d\n", rx_stats.sendSelects);
+    for (i = 0; i < RX_N_PACKET_TYPES; i++)
+        len += sprintf(buffer + len, "packetsRead[%d] = %d\n", i, rx_stats.packetsRead[i]);
+    len += sprintf(buffer + len, "dataPacketsRead = %d\n", rx_stats.dataPacketsRead);
+    len += sprintf(buffer + len, "ackPacketsRead = %d\n", rx_stats.ackPacketsRead);
+    len += sprintf(buffer + len, "dupPacketsRead = %d\n", rx_stats.dupPacketsRead);
+    len += sprintf(buffer + len, "spuriousPacketsRead = %d\n", rx_stats.spuriousPacketsRead);
+    for (i = 0; i < RX_N_PACKET_TYPES; i++)
+        len += sprintf(buffer + len, "packetsSent[%d] = %d\n", i, rx_stats.packetsSent[i]);
+    len += sprintf(buffer + len, "ackPacketsSent = %d\n", rx_stats.ackPacketsSent);
+    len += sprintf(buffer + len, "pingPacketsSent = %d\n", rx_stats.pingPacketsSent);
+    len += sprintf(buffer + len, "abortPacketsSent = %d\n", rx_stats.abortPacketsSent);
+    len += sprintf(buffer + len, "busyPacketsSent = %d\n", rx_stats.busyPacketsSent);
+    len += sprintf(buffer + len, "dataPacketsSent = %d\n", rx_stats.dataPacketsSent);
+    len += sprintf(buffer + len, "dataPacketsReSent = %d\n", rx_stats.dataPacketsReSent);
+    len += sprintf(buffer + len, "dataPacketsPushed = %d\n", rx_stats.dataPacketsPushed);
+    len += sprintf(buffer + len, "ignoreAckedPacket = %d\n", rx_stats.ignoreAckedPacket);
+    len += sprintf(buffer + len, "totalRtt = %d sec, %d usec\n", rx_stats.totalRtt.sec,
+           rx_stats.totalRtt.usec);
+    len += sprintf(buffer + len, "minRtt = %d sec, %d usec\n", rx_stats.minRtt.sec,
+           rx_stats.minRtt.usec);
+    len += sprintf(buffer + len, "maxRtt = %d sec, %d usec\n", rx_stats.maxRtt.sec,
+           rx_stats.maxRtt.usec);
+    len += sprintf(buffer + len, "nRttSamples = %d\n", rx_stats.nRttSamples);
+    len += sprintf(buffer + len, "nServerConns = %d\n", rx_stats.nServerConns);
+    len += sprintf(buffer + len, "nClientConns = %d\n", rx_stats.nClientConns);
+    len += sprintf(buffer + len, "nPeerStructs = %d\n", rx_stats.nPeerStructs);
+    len += sprintf(buffer + len, "nCallStructs = %d\n", rx_stats.nCallStructs);
+    len += sprintf(buffer + len, "nFreeCallStructs = %d\n", rx_stats.nFreeCallStructs);
+    len += sprintf(buffer + len, "netSendFailures  = %d\n", rx_stats.netSendFailures);
+    len += sprintf(buffer + len, "fatalErrors      = %d\n", rx_stats.fatalErrors);
+    
+    if (offset >= len) {
+       *start = buffer;
+       *eof = 1;
+       return 0;
+    }
+    *start = buffer + offset;
+    if ((len -= offset) > count)
+       return count;
+    *eof = 1;
+    return len;
+}
 
-    RWLOCK_INIT(&afs_xosi, "afs_xosi");
+int
+rxproc_read(char *buffer, char **start, off_t offset, int count,
+             int *eof, void *data)
+{
+    int len, i;
+    
+    len = 0;
+    len += sprintf(buffer + len, "rx_extraQuota = %d\n", rx_extraQuota);
+    len += sprintf(buffer + len, "rx_extraPackets = %d\n", rx_extraPackets);
+    len += sprintf(buffer + len, "rx_stackSize = %d\n", rx_stackSize);
+    len += sprintf(buffer + len, "rx_connDeadTime = %d\n", rx_connDeadTime);
+    len += sprintf(buffer + len, "rx_idleConnectionTime = %d\n", rx_idleConnectionTime);
+    len += sprintf(buffer + len, "rx_idlePeerTime = %d\n", rx_idlePeerTime);
+    len += sprintf(buffer + len, "rx_initSendWindow = %d\n", rx_initSendWindow);
+    len += sprintf(buffer + len, "rxi_nSendFrags = %d\n", rxi_nSendFrags);
+    len += sprintf(buffer + len, "rx_nPackets = %d\n", rx_nPackets);
+    len += sprintf(buffer + len, "rx_nFreePackets = %d\n", rx_nFreePackets);
+    len += sprintf(buffer + len, "rx_socket = 0x%lx\n", (unsigned long)rx_socket);
+    len += sprintf(buffer + len, "rx_Port = %d\n", rx_port);
+    for (i = 0; i < RX_N_PACKET_CLASSES; i++)
+       len += sprintf(buffer + len, "\trx_packetQuota[%d] = %d\n", i, rx_packetQuota[i]);
+
+    len += sprintf(buffer + len, "rx_nextCid = 0x%x\n", rx_nextCid);
+    len += sprintf(buffer + len, "rx_epoch = 0u%u\n", rx_epoch);
+    len += sprintf(buffer + len, "rx_waitingForPackets = %x\n", rx_waitingForPackets);
+    len += sprintf(buffer + len, "rxi_nCalls = %d\n", rxi_nCalls);
+    len += sprintf(buffer + len, "rxi_dataQuota = %d\n", rxi_dataQuota);
+    len += sprintf(buffer + len, "rxi_availProcs = %d\n", rxi_availProcs);
+    len += sprintf(buffer + len, "rxi_totalMin = %d\n", rxi_totalMin);
+    len += sprintf(buffer + len, "rxi_minDeficit = %d\n", rxi_minDeficit);
+
+    len += sprintf(buffer + len, "rxevent_nFree = %d\nrxevent_nPosted = %d\n", rxevent_nFree, rxevent_nPosted);
+    
+    if (offset >= len) {
+       *start = buffer;
+       *eof = 1;
+       return 0;
+    }
+    *start = buffer + offset;
+    if ((len -= offset) > count)
+       return count;
+    *eof = 1;
+    return len;
+}
 
-    /* obtain PAGE_OFFSET value */
-    afs_linux_page_offset = get_page_offset();
+int
+connproc_read(char *buffer, char **start, off_t offset, int count,
+             int *eof, void *data)
+{
+    int len, i, j;
+    struct rx_connection *sep;
+    
+    len = 0;
+    for (i = 0, j = 0; i < 256; i++) {
+        for (sep = rx_connHashTable[i]; sep; sep = sep->next, j++) {
+           len += sprintf(buffer + len, "%lx: next=0x%lx, peer=0x%lx, epoch=0x%x, cid=0x%x, ackRate=%d\n",
+                          (unsigned long)sep, (unsigned long)sep->next, (unsigned long)sep->peer,
+                          sep->epoch, sep->cid, sep->ackRate);
+           len += sprintf(buffer + len, "\tcall[%lx=%d, %lx=%d, %lx=%d, %lx=%d]\n", 
+                          (unsigned long)sep->call[0], sep->callNumber[0],
+                          (unsigned long)sep->call[1], sep->callNumber[1],
+                          (unsigned long)sep->call[2], sep->callNumber[2],
+                          (unsigned long)sep->call[3], sep->callNumber[3]);
+            len += sprintf(buffer + len, "\ttimeout=%d, flags=0x%x, type=0x%x, serviceId=%d, service=0x%lx, refCount=%d\n",
+                          sep->timeout, sep->flags, sep->type, 
+                          sep->serviceId, (unsigned long)sep->service, sep->refCount);
+            len += sprintf(buffer + len, "\tserial=%d, lastSerial=%d, secsUntilDead=%d, secsUntilPing=%d, secIndex=%d\n",
+                          sep->serial, sep->lastSerial, sep->secondsUntilDead,
+                          sep->secondsUntilPing, sep->securityIndex);
+            len += sprintf(buffer + len, "\terror=%d, secObject=0x%lx, secData=0x%lx, secHeaderSize=%d, secmaxTrailerSize=%d\n",
+                          sep->error, (unsigned long)sep->securityObject,
+                          (unsigned long)sep->securityData,
+                          sep->securityHeaderSize, sep->securityMaxTrailerSize);
+            len += sprintf(buffer + len, "\tchallEvent=0x%lx, lastSendTime=0x%x, maxSerial=%d, hardDeadTime=%d\n",
+                          (unsigned long)sep->challengeEvent, sep->lastSendTime, 
+                          sep->maxSerial, sep->hardDeadTime);
+            if (sep->flags & RX_CONN_MAKECALL_WAITING)
+               len += sprintf(buffer + len, "\t***** Conn in RX_CONN_MAKECALL_WAITING state *****\n");
+#ifdef RX_ENABLE_LOCKS
+            len += sprintf(buffer + len, "\tcall_lock=%d, call_cv=%d, data_lock=%d, refCount=%d\n",
+                          sep->conn_call_lock, sep->conn_call_cv, 
+                          sep->conn_data_lock, sep->refCount);
+#endif /* RX_ENABLE_LOCKS */
+        }
+    }
+    
+    if (offset >= len) {
+       *start = buffer;
+       *eof = 1;
+       return 0;
+    }
+    *start = buffer + offset;
+    if ((len -= offset) > count)
+       return count;
+    *eof = 1;
+    return len;
+}
 
-#ifndef AFS_S390_LINUX22_ENV
-    if (afs_linux_page_offset == 0) {
-        /* couldn't obtain page offset so can't continue */
-        printf("afs: Unable to obtain PAGE_OFFSET. Exiting..");
-        return -EIO;
+int
+servicesproc_read(char *buffer, char **start, off_t offset, int count,
+             int *eof, void *data)
+{
+    int len, i, j;
+    struct rx_service *sentry;
+    
+    len = 0;
+    for (i = 0, j = 0; i < RX_MAX_SERVICES; i++) {
+        if ((sentry = rx_services[i])) {
+            j++;
+           len += sprintf(buffer + len,
+                          "\t%lx: serviceId=%d, port=%d, serviceName=%s, socket=0x%lx\n",
+                          (unsigned long)sentry, sentry->serviceId, sentry->servicePort,
+                          sentry->serviceName, (unsigned long)sentry->socket);
+           len += sprintf(buffer + len,
+                          "\t\tnSecObj=%d, nReqRunning=%d, maxProcs=%d, minProcs=%d, connDeadTime=%d, idleDeadTime=%d\n",
+                          sentry->nSecurityObjects, sentry->nRequestsRunning,
+                          sentry->maxProcs, sentry->minProcs, 
+                          sentry->connDeadTime, sentry->idleDeadTime);
+       }
     }
-#endif
-#ifndef EXPORTED_SYS_CALL_TABLE
-    sys_call_table=0;
-
-#ifdef EXPORTED_KALLSYMS_SYMBOL
-    ret=1;
-    token=0;
-    while (ret) {
-      sym_start=0;
-      ret=kallsyms_symbol_to_address("sys_call_table", &token, &mod_name,
-                                    &mod_start, &mod_end, &sec_name, &sec_start, &sec_end,
-                                    &sym_name, &sym_start, &sym_end);
-      if (ret && !strcmp(mod_name, "kernel"))
-       break;
+    
+    if (offset >= len) {
+       *start = buffer;
+       *eof = 1;
+       return 0;
     }
-    if (ret && sym_start) {
-      sys_call_table=sym_start;
+    *start = buffer + offset;
+    if ((len -= offset) > count)
+       return count;
+    *eof = 1;
+    return len;
+}
+
+int
+callproc_read(char *buffer, char **start, off_t offset, int count,
+             int *eof, void *data)
+{
+    int len, i, j, k;
+    struct rx_connection *sep;
+    
+    len = 0;
+    for (i = 0, j = 0; i < 256; i++) {
+        for (sep = rx_connHashTable[i]; sep; sep = sep->next) {
+           for (k = 0; k < RX_MAXCALLS; k++) {
+                struct rx_call *call = sep->call[k];
+                if (call) {
+                    j++;
+                   len += sprintf(buffer + len,
+                                  "%lx: conn=0x%lx, qiheader(0x%lx:0x%lx), tq(0x%lx:0x%lx), rq(0x%lx:0x%lx)\n",
+                                  (unsigned long)call, (unsigned long)call->conn,
+                                  (unsigned long)call->queue_item_header.prev,
+                                  (unsigned long)call->queue_item_header.next,
+                                  (unsigned long)call->tq.prev, (unsigned long)call->tq.next,
+                                  (unsigned long)call->rq.prev, (unsigned long)call->rq.next);
+                    len += sprintf(buffer + len, 
+                                  "\t: curvec=%d, curpos=%lx, nLeft=%d, nFree=%d, currPacket=0x%lx, callNumber=0x%lx\n",
+                                  call->curvec, (unsigned long)call->curpos, call->nLeft,
+                                  call->nFree, (unsigned long)call->currentPacket,
+                                  (unsigned long)call->callNumber);
+                   len += sprintf(buffer + len,
+                                  "\t: channel=%d, state=0x%x, mode=0x%x, flags=0x%x, localStatus=0x%x, remStatus=0x%x\n",
+                                  call->channel, call->state, call->mode,
+                                  call->flags, call->localStatus,
+                                  call->remoteStatus);
+                    len += sprintf(buffer + len,
+                                  "\t: error=%d, timeout=0x%x, rnext=0x%x, rprev=0x%x, rwind=0x%x, tfirst=0x%x, tnext=0x%x\n",
+                                  call->error, call->timeout, call->rnext,
+                                  call->rprev, call->rwind, call->tfirst,
+                                  call->tnext);
+                    len += sprintf(buffer + len,
+                                  "\t: twind=%d, resendEvent=0x%lx, timeoutEvent=0x%lx, keepAliveEvent=0x%lx, delayedAckEvent=0x%lx\n",
+                                  call->twind, (unsigned long)call->resendEvent,
+                                  (unsigned long)call->timeoutEvent,
+                                  (unsigned long)call->keepAliveEvent,
+                                  (unsigned long)call->delayedAckEvent);
+                   len += sprintf(buffer + len,
+                                  "\t: lastSendTime=0x%x, lastReceiveTime=0x%x, lastAcked=0x%x, startTime=0x%x, startWait=0x%x\n",
+                                  call->lastSendTime, call->lastReceiveTime,
+                                  call->lastAcked, call->startTime.sec,
+                                  call->startWait);
+                    if (call->flags & RX_CALL_WAIT_PROC)
+                        len += sprintf(buffer + len,
+                                      "\t******** Call in RX_CALL_WAIT_PROC state **********\n");
+                    if (call->flags & RX_CALL_WAIT_WINDOW_ALLOC)
+                        len += sprintf(buffer + len,
+                                      "\t******** Call in RX_CALL_WAIT_WINDOW_ALLOC state **********\n");
+                    if (call->flags & RX_CALL_READER_WAIT)
+                        len += sprintf(buffer + len,
+                                      "\t******** Conn in RX_CALL_READER_WAIT state **********\n");
+                    if (call->flags & RX_CALL_WAIT_PACKETS)
+                        len += sprintf(buffer + len,
+                                      "\t******** Conn in RX_CALL_WAIT_PACKETS state **********\n");
+#ifdef RX_ENABLE_LOCKS
+                    len += sprintf(buffer + len,
+                                  "\t: lock=0x%x, cv_twind=0x%x, cv_rq=0x%x, refCount= %d\n",
+                                  call->lock, call->cv_twind, call->cv_rq,
+                                  call->refCount);
+#endif /* RX_ENABLE_LOCKS */
+                    len += sprintf(buffer + len, "\t: MTU=%d\n", call->MTU);
+                }
+           }
+        }
     }
-#else
-#ifdef EXPORTED_KALLSYMS_ADDRESS
-    ret=kallsyms_address_to_symbol((unsigned long)&init_mm, &mod_name,
-                                  &mod_start, &mod_end, &sec_name, &sec_start, &sec_end,
-                                  &sym_name, &sym_start, &sym_end);
-    ptr=(unsigned long *)sec_start;
-    datalen=(sec_end-sec_start)/sizeof(unsigned long);
-#else
-#if defined(AFS_IA64_LINUX20_ENV)
-    ptr = (unsigned long *) (&sys_close - 0x180000);
-    datalen=0x180000/sizeof(ptr);
-#else
-    ptr=(unsigned long *)&init_mm;
-    datalen=16384;
-#endif
+    
+    if (offset >= len) {
+       *start = buffer;
+       *eof = 1;
+       return 0;
+    }
+    *start = buffer + offset;
+    if ((len -= offset) > count)
+       return count;
+    *eof = 1;
+    return len;
+}
+
+static struct proc_dir_entry *openafs_procfs;
+#if defined(NEED_IOCTL32) && !defined(HAVE_COMPAT_IOCTL)
+static int ioctl32_done;
 #endif
-    for (offset=0;offset <datalen;ptr++,offset++) {
-#if defined(AFS_IA64_LINUX20_ENV)
-       unsigned long close_ip=(unsigned long) ((struct fptr *)&sys_close)->ip;
-       unsigned long chdir_ip=(unsigned long) ((struct fptr *)&sys_chdir)->ip;
-       unsigned long write_ip=(unsigned long) ((struct fptr *)&sys_write)->ip;
-       if (ptr[0] == close_ip &&
-           ptr[__NR_chdir - __NR_close] == chdir_ip &&
-           ptr[__NR_write - __NR_close] == write_ip) {
-           sys_call_table=(void *) &(ptr[ -1 * (__NR_close-1024)]);
-           break;
-       }
-#else
-#if defined(EXPORTED_SYS_CHDIR) && defined(EXPORTED_SYS_CLOSE)
-        if (ptr[0] == (unsigned long)&sys_close &&
-           ptr[__NR_chdir - __NR_close] == (unsigned long)&sys_chdir) {
-           sys_call_table=ptr - __NR_close;
-           break;
-       }
+
+#ifdef AFS_LINUX24_ENV
+static int
+afsproc_init(void)
+{
+    struct proc_dir_entry *entry2;
+    struct proc_dir_entry *entry1;
+    struct proc_dir_entry *entry;
+
+    openafs_procfs = proc_mkdir(PROC_FSDIRNAME, proc_root_fs);
+    entry1 = create_proc_entry(PROC_SYSCALL_NAME, 0666, openafs_procfs);
+
+    entry1->proc_fops = &afs_syscall_fops;
+
+    entry1->owner = THIS_MODULE;
+
+#ifdef HAVE_KERNEL_LINUX_SEQ_FILE_H
+    entry2 = create_proc_entry(PROC_CELLSERVDB_NAME, 0, openafs_procfs);
+    if (entry2)
+       entry2->proc_fops = &afs_csdb_operations;
 #else
-       if (ptr[0] == (unsigned long)&sys_exit &&
-           ptr[__NR_open - __NR_exit] == (unsigned long)&sys_open) {
-           sys_call_table=ptr - __NR_exit;
-           break;
-       }
+    entry2 = create_proc_info_entry(PROC_CELLSERVDB_NAME, (S_IFREG|S_IRUGO), openafs_procfs, csdbproc_info);
+#endif
+
+    entry = create_proc_read_entry(PROC_PEER_NAME, (S_IFREG|S_IRUGO), openafs_procfs, peerproc_read, NULL);
+
+    entry = create_proc_read_entry(PROC_CONN_NAME, (S_IFREG|S_IRUGO), openafs_procfs, connproc_read, NULL);
+
+    entry = create_proc_read_entry(PROC_CALL_NAME, (S_IFREG|S_IRUGO), openafs_procfs, connproc_read, NULL);
+
+    entry = create_proc_read_entry(PROC_RX_NAME, (S_IFREG|S_IRUGO), openafs_procfs, rxproc_read, NULL);
+
+    entry = create_proc_read_entry(PROC_SERVICES_NAME, (S_IFREG|S_IRUGO), openafs_procfs, servicesproc_read, NULL);
+
+    entry = create_proc_read_entry(PROC_RXSTATS_NAME, (S_IFREG|S_IRUGO), openafs_procfs, rxstatsproc_read, NULL);
+#if defined(NEED_IOCTL32) && !defined(HAVE_COMPAT_IOCTL)
+    if (register_ioctl32_conversion(VIOC_SYSCALL32, NULL) == 0) 
+           ioctl32_done = 1;
 #endif
+
+    return 0;
+}
+
+static void
+afsproc_exit(void)
+{
+    remove_proc_entry(PROC_RXSTATS_NAME, openafs_procfs);
+    remove_proc_entry(PROC_SERVICES_NAME, openafs_procfs);
+    remove_proc_entry(PROC_RX_NAME, openafs_procfs);
+    remove_proc_entry(PROC_CALL_NAME, openafs_procfs);
+    remove_proc_entry(PROC_CONN_NAME, openafs_procfs);
+    remove_proc_entry(PROC_PEER_NAME, openafs_procfs);
+    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(NEED_IOCTL32) && !defined(HAVE_COMPAT_IOCTL)
+    if (ioctl32_done)
+           unregister_ioctl32_conversion(VIOC_SYSCALL32);
 #endif
-    }
-#ifdef EXPORTED_KALLSYMS_ADDRESS
-    ret=kallsyms_address_to_symbol((unsigned long)sys_call_table, &mod_name,
-                                  &mod_start, &mod_end, &sec_name, &sec_start, &sec_end,
-                                  &sym_name, &sym_start, &sym_end);
-    if (ret && strcmp(sym_name, "sys_call_table"))
-      sys_call_table=0;
+}
 #endif
+
+extern asmlinkage long
+afs_syscall(long syscall, long parm1, long parm2, long parm3, long parm4);
+
+static int
+afs_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
+         unsigned long arg)
+{
+
+    struct afsprocdata sysargs;
+#ifdef NEED_IOCTL32
+    struct afsprocdata32 sysargs32;
 #endif
-    if (!sys_call_table) {
-      printf("Failed to find address of sys_call_table\n");
-      return -EIO;
+
+    if (cmd != VIOC_SYSCALL && cmd != VIOC_SYSCALL32) return -EINVAL;
+
+#ifdef NEED_IOCTL32
+#ifdef AFS_LINUX26_ENV 
+#ifdef AFS_S390X_LINUX26_ENV
+    if (test_thread_flag(TIF_31BIT))
+#elif AFS_AMD64_LINUX20_ENV
+    if (test_thread_flag(TIF_IA32))
+#else
+    if (test_thread_flag(TIF_32BIT))
+#endif /* AFS_S390X_LINUX26_ENV */
+#else
+#ifdef AFS_SPARC64_LINUX24_ENV
+    if (current->thread.flags & SPARC_FLAG_32BIT)
+#elif defined(AFS_SPARC64_LINUX20_ENV)
+    if (current->tss.flags & SPARC_FLAG_32BIT)
+#elif defined(AFS_AMD64_LINUX20_ENV)
+    if (current->thread.flags & THREAD_IA32)
+#elif defined(AFS_PPC64_LINUX20_ENV)
+    if (current->thread.flags & PPC_FLAG_32BIT)
+#elif defined(AFS_S390X_LINUX20_ENV)
+    if (current->thread.flags & S390_FLAG_31BIT)
+#else
+#error Not done for this linux type
+#endif /* AFS_LINUX26_ENV */
+#endif /* NEED_IOCTL32 */
+    {
+       if (copy_from_user(&sysargs32, (void *)arg,
+                          sizeof(struct afsprocdata32)))
+           return -EFAULT;
+
+       return afs_syscall((unsigned long)sysargs32.syscall,
+                          (unsigned long)sysargs32.param1,
+                          (unsigned long)sysargs32.param2,
+                          (unsigned long)sysargs32.param3,
+                          (unsigned long)sysargs32.param4);
+    } else
+#endif
+    {
+       if (copy_from_user(&sysargs, (void *)arg, sizeof(struct afsprocdata)))
+           return -EFAULT;
+
+       return afs_syscall(sysargs.syscall, sysargs.param1,
+                          sysargs.param2, sysargs.param3, sysargs.param4);
     }
-    printf("Found sys_call_table at %x\n", sys_call_table);
-# ifdef AFS_SPARC64_LINUX20_ENV
-    error cant support this yet.
-#endif
-#endif /* EXPORTED_SYS_CALL_TABLE */
-      
-    /* Initialize pointers to kernel syscalls. */
-#if defined(AFS_IA64_LINUX20_ENV)
-    kernel_gp = ((struct fptr *)printk)->gp;
+}
 
-    sys_settimeofdayp = (void *) &sys_settimeofday;
+#if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL)
+static long afs_unlocked_ioctl(struct file *file, unsigned int cmd,
+                               unsigned long arg) {
+    return afs_ioctl(FILE_INODE(file), file, cmd, arg);
+}
+#endif
 
-    ((struct fptr *)sys_settimeofdayp)->ip =
-               SYSCALL2POINTER sys_call_table[__NR_settimeofday - 1024];
-    ((struct fptr *)sys_settimeofdayp)->gp = kernel_gp;
-    
-#else /* !AFS_IA64_LINUX20_ENV */
-    sys_settimeofdayp = SYSCALL2POINTER sys_call_table[__NR_settimeofday];
-#endif /* AFS_IA64_LINUX20_ENV */
-
-    /* setup AFS entry point. */
-    if (
-#if defined(AFS_IA64_LINUX20_ENV)
-       SYSCALL2POINTER sys_call_table[__NR_afs_syscall - 1024]
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+int __init
+afs_init(void)
 #else
-       SYSCALL2POINTER sys_call_table[__NR_afs_syscall] 
+int
+init_module(void)
 #endif
-       == afs_syscall) {
-       printf("AFS syscall entry point already in use!\n");
-       return -EBUSY;
-    }
+{
+    int err;
+    RWLOCK_INIT(&afs_xosi, "afs_xosi");
 
-#if defined(AFS_IA64_LINUX20_ENV)
-    afs_ni_syscall = sys_call_table[__NR_afs_syscall - 1024];
-    sys_call_table[__NR_afs_syscall - 1024] = POINTER2SYSCALL ((struct fptr *)afs_syscall_stub)->ip;
-#else /* AFS_IA64_LINUX20_ENV */
-    afs_ni_syscall = sys_call_table[__NR_afs_syscall];
-    sys_call_table[__NR_afs_syscall] = POINTER2SYSCALL afs_syscall;
-# ifdef AFS_SPARC64_LINUX20_ENV
-    afs_ni_syscall32 = sys_call_table32[__NR_afs_syscall];
-    sys_call_table32[__NR_afs_syscall] = POINTER2SYSCALL afs_syscall32;
-# endif
-#endif /* AFS_IA64_LINUX20_ENV */
+#if !defined(AFS_LINUX24_ENV)
+    /* obtain PAGE_OFFSET value */
+    afs_linux_page_offset = get_page_offset();
+
+#ifndef AFS_S390_LINUX22_ENV
+    if (afs_linux_page_offset == 0) {
+       /* couldn't obtain page offset so can't continue */
+       printf("afs: Unable to obtain PAGE_OFFSET. Exiting..");
+       return -EIO;
+    }
+#endif /* AFS_S390_LINUX22_ENV */
+#endif /* !defined(AFS_LINUX24_ENV) */
 
     osi_Init();
-    register_filesystem(&afs_file_system);
-
-    /* Intercept setgroups calls */
-#if defined(AFS_IA64_LINUX20_ENV)
-    sys_setgroupsp = (void *) &sys_setgroups;
-
-    ((struct fptr *)sys_setgroupsp)->ip =
-               SYSCALL2POINTER sys_call_table[__NR_setgroups - 1024];
-    ((struct fptr *)sys_setgroupsp)->gp = kernel_gp;
-
-    sys_call_table[__NR_setgroups - 1024] = POINTER2SYSCALL ((struct fptr *)afs_xsetgroups_stub)->ip;
-#else /* AFS_IA64_LINUX20_ENV */
-    sys_setgroupsp = SYSCALL2POINTER sys_call_table[__NR_setgroups];
-    sys_call_table[__NR_setgroups] = POINTER2SYSCALL afs_xsetgroups;
-# ifdef AFS_SPARC64_LINUX20_ENV
-    sys32_setgroupsp = SYSCALL2POINTER sys_call_table32[__NR_setgroups];
-    sys_call_table32[__NR_setgroups] = POINTER2SYSCALL afs32_xsetgroups;
-# endif
-# if defined(__NR_setgroups32)
-    sys_setgroups32p = SYSCALL2POINTER sys_call_table[__NR_setgroups32];
-    sys_call_table[__NR_setgroups32] = POINTER2SYSCALL afs_xsetgroups32;
-# ifdef AFS_SPARC64_LINUX20_ENV
-    sys32_setgroups32p = SYSCALL2POINTER sys_call_table32[__NR_setgroups32];
-    sys_call_table32[__NR_setgroups32] = POINTER2SYSCALL afs32_xsetgroups32;
-# endif
-# endif
-#endif /* AFS_IA64_LINUX20_ENV */
 
+    err = osi_syscall_init();
+    if (err)
+       return err;
+    err = afs_init_inodecache();
+    if (err)
+       return err;
+    register_filesystem(&afs_fs_type);
     osi_sysctl_init();
+#ifdef AFS_LINUX24_ENV
+    afsproc_init();
+#endif
 
     return 0;
 }
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-void __exit afs_cleanup(void)
+void __exit
+afs_cleanup(void)
 #else
-void cleanup_module(void)
+void
+cleanup_module(void)
 #endif
 {
-    struct task_struct *t;
-
     osi_sysctl_clean();
+    osi_syscall_clean();
+    unregister_filesystem(&afs_fs_type);
 
-#if defined(AFS_IA64_LINUX20_ENV)
-    sys_call_table[__NR_setgroups - 1024] = POINTER2SYSCALL ((struct fptr *) sys_setgroupsp)->ip;
-    sys_call_table[__NR_afs_syscall - 1024] = afs_ni_syscall;
-#else /* AFS_IA64_LINUX20_ENV */
-    sys_call_table[__NR_setgroups] = POINTER2SYSCALL sys_setgroupsp;
-    sys_call_table[__NR_afs_syscall] = afs_ni_syscall;
-# ifdef AFS_SPARC64_LINUX20_ENV
-    sys_call_table32[__NR_setgroups] = POINTER2SYSCALL sys32_setgroupsp;
-    sys_call_table32[__NR_afs_syscall] = afs_ni_syscall32;
-# endif
-# if defined(__NR_setgroups32)
-    sys_call_table[__NR_setgroups32] = POINTER2SYSCALL sys_setgroups32p;
-# ifdef AFS_SPARC64_LINUX20_ENV
-    sys_call_table32[__NR_setgroups32] = POINTER2SYSCALL sys32_setgroups32p;
-# endif
-# endif
-#endif /* AFS_IA64_LINUX20_ENV */
-    unregister_filesystem(&afs_file_system);
-
-    osi_linux_free_inode_pages(); /* Invalidate all pages using AFS inodes. */
+    afs_destroy_inodecache();
     osi_linux_free_afs_memory();
 
+#ifdef AFS_LINUX24_ENV
+    afsproc_exit();
+#endif
     return;
 }
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
 module_init(afs_init);
 module_exit(afs_cleanup);
 #endif
 
 
-static long get_page_offset(void)
+#if !defined(AFS_LINUX24_ENV)
+static long
+get_page_offset(void)
 {
-#if defined(AFS_PPC_LINUX22_ENV) || defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_SPARC_LINUX20_ENV) || defined(AFS_ALPHA_LINUX20_ENV) || defined(AFS_S390_LINUX22_ENV) || defined(AFS_IA64_LINUX20_ENV) || defined(AFS_PARISC_LINUX24_ENV) || defined(AFS_AMD64_LINUX20_ENV)
+#if defined(AFS_PPC_LINUX22_ENV) || defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_SPARC_LINUX20_ENV) || defined(AFS_ALPHA_LINUX20_ENV) || defined(AFS_S390_LINUX22_ENV) || defined(AFS_IA64_LINUX20_ENV) || defined(AFS_PARISC_LINUX24_ENV) || defined(AFS_AMD64_LINUX20_ENV) || defined(AFS_PPC64_LINUX20_ENV)
     return PAGE_OFFSET;
 #else
     struct task_struct *p, *q;
@@ -439,21 +768,22 @@ static long get_page_offset(void)
 #endif
     /* search backward thru the circular list */
 #ifdef DEFINED_PREV_TASK
-    for(q = current; p = q; q = prev_task(p)) {
+    for (q = current; p = q; q = prev_task(p)) {
 #else
-    for(p = current; p; p = p->prev_task) {
+    for (p = current; p; p = p->prev_task) {
 #endif
-           if (p->pid == 1) {
+       if (p->pid == 1) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-                   read_unlock(&tasklist_lock);
+           read_unlock(&tasklist_lock);
 #endif
-                   return p->addr_limit.seg;
-           }
+           return p->addr_limit.seg;
+       }
     }
-  
+
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
     read_unlock(&tasklist_lock);
 #endif
-  return 0;
+    return 0;
 #endif
 }
+#endif /* !AFS_LINUX24_ENV */