Remove pre-Linux 2.6 support

[openafs.git] / src / afs / LINUX / osi_misc.c

diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c
index 79314e7..4848d94 100644 (file)
--- a/src/afs/LINUX/osi_misc.c
+++ b/src/afs/LINUX/osi_misc.c
@@ -14,59 +14,31 @@
 #include <afsconfig.h>
 #include "afs/param.h"
 
-RCSID
-    ("$Header$");
 
 #include <linux/module.h> /* early to avoid printf->printk mapping */
+#include "h/dcache.h"
+#include "h/namei.h"
+#include "h/kthread.h"
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
 #include "afs/afs_stats.h"
-#if defined(AFS_LINUX24_ENV)
 #include "h/smp_lock.h"
-#endif
-#if defined(AFS_LINUX26_ENV)
-#include "h/namei.h"
-#include "h/kthread.h"
-#endif
 
 int afs_osicred_initialized = 0;
-struct AFS_UCRED afs_osi_cred;
+AFS_UCRED afs_osi_cred;
 
 void
 afs_osi_SetTime(osi_timeval_t * tvp)
 {
-#if defined(AFS_LINUX24_ENV)
-
-#if defined(AFS_LINUX26_ENV)
     struct timespec tv;
     tv.tv_sec = tvp->tv_sec;
     tv.tv_nsec = tvp->tv_usec * NSEC_PER_USEC;
-#else
-    struct timeval tv;
-    tv.tv_sec = tvp->tv_sec;
-    tv.tv_usec = tvp->tv_usec;
-#endif
 
     AFS_STATCNT(osi_SetTime);
 
     do_settimeofday(&tv);
-#else
-    extern int (*sys_settimeofdayp) (struct timeval * tv,
-                                    struct timezone * tz);
-
-    KERNEL_SPACE_DECL;
-
-    AFS_STATCNT(osi_SetTime);
-
-    TO_USER_SPACE();
-    if (sys_settimeofdayp)
-       (void)(*sys_settimeofdayp) (tvp, NULL);
-    TO_KERNEL_SPACE();
-#endif
 }
 
-struct task_struct *rxk_ListenerTask;
-
 void
 osi_linux_mask(void)
 {
@@ -76,14 +48,6 @@ osi_linux_mask(void)
     SIG_UNLOCK(current);
 }
 
-void
-osi_linux_rxkreg(void)
-{
-    rxk_ListenerTask = current;
-}
-
-
-#if defined(AFS_LINUX24_ENV)
 /* LOOKUP_POSITIVE is becoming the default */
 #ifndef LOOKUP_POSITIVE
 #define LOOKUP_POSITIVE 0
@@ -100,24 +64,27 @@ osi_lookupname_internal(char *aname, int followlink, struct vfsmount **mnt,
 
     if (followlink)
        flags |= LOOKUP_FOLLOW;
-#if defined(AFS_LINUX26_ENV)
     code = path_lookup(aname, flags, &nd);
-#else
-    if (path_init(aname, flags, &nd))
-        code = path_walk(aname, &nd);
-#endif
 
     if (!code) {
+#if defined(STRUCT_NAMEIDATA_HAS_PATH)
+       *dpp = dget(nd.path.dentry);
+        if (mnt)
+           *mnt = mntget(nd.path.mnt);
+       path_put(&nd.path);
+#else
        *dpp = dget(nd.dentry);
         if (mnt)
            *mnt = mntget(nd.mnt);
        path_release(&nd);
+#endif
     }
     return code;
 }
+
 int
 osi_lookupname(char *aname, uio_seg_t seg, int followlink, 
-                       struct dentry **dpp)
+              struct dentry **dpp)
 {
     int code;
     char *tname;
@@ -135,42 +102,12 @@ osi_lookupname(char *aname, uio_seg_t seg, int followlink,
     }
     return code;
 }
-#else
-int
-osi_lookupname(char *aname, uio_seg_t seg, int followlink, struct dentry **dpp)
-{
-    struct dentry *dp = NULL;
-    int code;
 
-    code = ENOENT;
-    if (seg == AFS_UIOUSER) {
-       dp = followlink ? namei(aname) : lnamei(aname);
-    } else {
-       dp = lookup_dentry(aname, NULL, followlink ? 1 : 0);
-    }
-
-    if (dp && !IS_ERR(dp)) {
-       if (dp->d_inode) {
-           *dpp = dp;
-           code = 0;
-       } else
-           dput(dp);
-    }
-
-    return code;
-}
-#endif
-
-
-#ifdef AFS_LINUX26_ENV
-/* This is right even for Linux 2.4, but on that version d_path is inline
- * and implemented in terms of __d_path, which is not exported.
- */
 int osi_abspath(char *aname, char *buf, int buflen,
                int followlink, char **pathp)
 {
     struct dentry *dp = NULL;
-    struct vfsmnt *mnt = NULL;
+    struct vfsmount *mnt = NULL;
     char *tname, *path;
     int code;
 
@@ -180,7 +117,12 @@ int osi_abspath(char *aname, char *buf, int buflen,
        return -PTR_ERR(tname);
     code = osi_lookupname_internal(tname, followlink, &mnt, &dp);   
     if (!code) {
+#if defined(D_PATH_TAKES_STRUCT_PATH)
+       struct path p = { mnt, dp };
+       path = d_path(&p, buf, buflen);
+#else
        path = d_path(dp, mnt, buf, buflen);
+#endif
 
        if (IS_ERR(path)) {
            code = -PTR_ERR(path);
@@ -213,4 +155,3 @@ void afs_start_thread(void (*proc)(void), char *name)
 {
     kthread_run(afs_thread_wrapper, proc, "%s", name);
 }
-#endif