Cleanup AFS_*LINUX_ENV usage

Commit 6329a523f6305541871bc3d1694065e7b17abe77 changed all
occurrences of AFS_*LINUXnn_ENV to AFS_*LINUX_ENV, but did not perform
any refactoring of the use of these variables.

This commit completes the task by refactoring the preprocessor
conditionals that involved removing dead code or collapsing statements.

The updates should have no functional changes.

Change-Id: I10fbefb7c862de2ec35ab77cafa2391e6e59f388
Reviewed-on: https://gerrit.openafs.org/14388
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>

diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h
index c120579..34940c6 100644 (file)
--- a/src/afs/LINUX/osi_machdep.h
+++ b/src/afs/LINUX/osi_machdep.h
@@ -170,26 +170,16 @@ afs_in_compat_syscall(void)
     return in_compat_syscall();
 # elif defined(AFS_SPARC64_LINUX_ENV)
     return test_thread_flag(TIF_32BIT);
-# elif defined(AFS_SPARC64_LINUX_ENV)
-    return (current->thread.flags & SPARC_FLAG_32BIT) != 0;
-# elif defined(AFS_SPARC64_LINUX_ENV)
-    return (current->tss.flags & SPARC_FLAG_32BIT) != 0;
 # elif defined(AFS_AMD64_LINUX_ENV)
     return test_thread_flag(TIF_IA32);
-# elif defined(AFS_AMD64_LINUX_ENV)
-    return (current->thread.flags & THREAD_IA32) != 0;
 # elif defined(AFS_PPC64_LINUX_ENV)
 #  if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO)
     return (current->thread_info->flags & _TIF_32BIT) != 0;
 #  else
     return (task_thread_info(current)->flags & _TIF_32BIT) != 0;
 #  endif
-# elif defined(AFS_PPC64_LINUX_ENV)
-   return (current->thread.flags & PPC_FLAG_32BIT) != 0;
 # elif defined(AFS_S390X_LINUX_ENV)
    return test_thread_flag(TIF_31BIT);
-# elif defined(AFS_S390X_LINUX_ENV)
-  return (current->thread.flags & S390_FLAG_31BIT) != 0;
 # elif defined(AFS_ARM64_LINUX_ENV)
   return is_compat_task();
 # else

diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c
index ae88797..bb3194f 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_lookup.c
+++ b/src/afs/VNOPS/afs_vnop_lookup.c
@@ -1643,7 +1643,7 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr
            hit = 1;
            goto done;
        }
-#else /* non - LINUX */
+#else
        code = 0;
        hit = 1;
        goto done;

diff --git a/src/afs/afs_init.c b/src/afs/afs_init.c
index e546ac1..d32237e 100644 (file)
--- a/src/afs/afs_init.c
+++ b/src/afs/afs_init.c
@@ -423,14 +423,6 @@ afs_InitCacheInfo(char *afile)
        if (!VFS_STATVFS(filevp->v_vfsp, &st))
 # elif defined(AFS_AIX41_ENV)
        if (!VFS_STATFS(filevp->v_vfsp, &st, &afs_osi_cred))
-# elif defined(AFS_LINUX_ENV)
-       {
-           KERNEL_SPACE_DECL;
-           TO_USER_SPACE();
-
-           VFS_STATFS(filevp->v_vfsp, &st);
-           TO_KERNEL_SPACE();
-       }
 # elif defined(AFS_DARWIN80_ENV)
        afs_cacheVfsp = vnode_mount(filevp);
        if (afs_cacheVfsp && ((st = *(vfs_statfs(afs_cacheVfsp))),1))
@@ -459,10 +451,7 @@ afs_InitCacheInfo(char *afile)
            afs_fsfragsize = st.f_bsize - 1;
 # endif /* AFS_SUN5_ENV || AFS_HPUX100_ENV */
     }
-# if defined(AFS_LINUX_ENV)
-    cacheInode.ufs = filevp->i_ino;
-    afs_cacheSBp = filevp->i_sb;
-# elif defined(AFS_XBSD_ENV)
+# if defined(AFS_XBSD_ENV)
     cacheInode.ufs = VTOI(filevp)->i_number;
     cacheDev.mp = filevp->v_mount;
     cacheDev.held_vnode = filevp;
@@ -483,7 +472,7 @@ afs_InitCacheInfo(char *afile)
     afs_LookupInodeByPath(afile, &cacheInode.ufs, NULL);
 #  endif /* !AFS_CACHE_VNODE_PATH */
     cacheDev.dev = afs_vnodeToDev(filevp);
-# endif /* AFS_LINUX_ENV */
+# endif /* AFS_XBSD_ENV */
     AFS_RELE(filevp);
 #endif /* AFS_LINUX_ENV */
     if (afs_fsfragsize < AFS_MIN_FRAGSIZE) {

diff --git a/src/afs/afs_osi.c b/src/afs/afs_osi.c
index 0dab7e6..b11e6dc 100644 (file)
--- a/src/afs/afs_osi.c
+++ b/src/afs/afs_osi.c
@@ -252,8 +252,6 @@ shutdown_osisleep(void)
                osi_FreeSmallSpace(tmp);
 #elif defined(AFS_LINUX_ENV)
                kfree(tmp);
-#elif defined(AFS_LINUX_ENV)
-               osi_linux_free(tmp);
 #endif
            }
        }

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index c70e460..b8fbadc 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -620,7 +620,6 @@ extern int osi_readRandom(void *, afs_size_t);
 
 /* LINUX/osi_misc.c */
 #ifdef AFS_LINUX_ENV
-#ifdef AFS_LINUX_ENV
 extern int osi_lookupname(char *aname, uio_seg_t seg, int followlink,
                          struct dentry **dpp);
 extern int osi_InitCacheInfo(char *aname);
@@ -630,7 +629,6 @@ extern void setup_uio(struct uio *uiop, struct iovec *iovecp, const char *buf,
                      uio_seg_t seg);
 extern int uiomove(char *dp, int length, uio_flag_t rw, struct uio *uiop);
 extern void osi_linux_free_inode_pages(void);
-#endif
 extern void osi_linux_mask(void);
 extern void osi_linux_unmaskrxk(void);
 extern int setpag(cred_t ** cr, afs_uint32 pagvalue, afs_uint32 * newpag,

diff --git a/src/afs/afsincludes.h b/src/afs/afsincludes.h
index 1a4369e..9841f2f 100644 (file)
--- a/src/afs/afsincludes.h
+++ b/src/afs/afsincludes.h
@@ -36,8 +36,6 @@
 #   undef TRUE
 #   undef FALSE
 #  endif
-# endif
-# ifdef AFS_LINUX_ENV
 #  undef __NFDBITS
 #  undef __FDMASK
 # endif

diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index 3e3e015..e1312f6 100644 (file)
--- a/src/afs/sysincludes.h
+++ b/src/afs/sysincludes.h
@@ -177,9 +177,7 @@ struct xfs_inode_info {
 # if defined(HAVE_LINUX_EXPORTFS_H)
 #  include <linux/exportfs.h>
 # endif
-# ifdef AFS_LINUX_ENV
-#  include <linux/pagemap.h>
-# endif
+# include <linux/pagemap.h>
 
 #else /* AFS_LINUX_ENV */
 

diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c
index afbef95..bd14fd6 100644 (file)
--- a/src/afsd/afsd.c
+++ b/src/afsd/afsd.c
@@ -1298,17 +1298,6 @@ CheckCacheBaseDir(char *dir)
        if (res != 0) {
            return "unable to statfs cache base directory";
        }
-#if !defined(AFS_LINUX_ENV)
-       if (statfsbuf.f_type == 0x52654973) {   /* REISERFS_SUPER_MAGIC */
-           return "cannot use reiserfs as cache partition";
-       } else if (statfsbuf.f_type == 0x58465342) {    /* XFS_SUPER_MAGIC */
-           return "cannot use xfs as cache partition";
-       } else if (statfsbuf.f_type == 0x01021994) {    /* TMPFS_SUPER_MAGIC */
-            return "cannot use tmpfs as cache partition";
-        } else if (statfsbuf.f_type != 0xEF53) {
-            return "must use ext2 or ext3 for cache partition";
-       }
-#endif
     }
 #endif
 

diff --git a/src/rx/xdr_rx.c b/src/rx/xdr_rx.c
index f315d16..1311332 100644 (file)
--- a/src/rx/xdr_rx.c
+++ b/src/rx/xdr_rx.c
@@ -21,8 +21,6 @@
 #  include "h/uio.h"
 #  ifdef AFS_LINUX_ENV
 #   include "h/socket.h"
-#  endif
-#  ifdef AFS_LINUX_ENV
 #   ifndef quad_t
 #    define quad_t __quad_t
 #    define u_quad_t __u_quad_t

diff --git a/src/venus/kdump.c b/src/venus/kdump.c
index 460fb86..ad722f6 100644 (file)
--- a/src/venus/kdump.c
+++ b/src/venus/kdump.c
@@ -551,11 +551,7 @@ PrintIPAddr(int addr)
 #ifdef AFS_LINUX_ENV
 /* Find symbols in a live kernel. */
 
-#ifdef AFS_LINUX_ENV
 #define KSYMS "/proc/kallsyms"
-#else
-#define KSYMS "/proc/ksyms"
-#endif
 
 /* symlist_t contains all the kernel symbols. Forcing a 64 byte array is
  * a bit wasteful, but simple.
@@ -626,13 +622,11 @@ read_ksyms(void)
        ksyms[nksyms].s_value = (int)strtoul(line, &p, 16);
 #endif /* AFS_LINUX_64BIT_KERNEL */
        p++;
-#ifdef AFS_LINUX_ENV
        /* Linux 2.6 /proc/kallsyms has a one-char symbol type
           between address and name, so step over it and the following
           blank.
        */
        p += 2;
-#endif
        q = strchr(p, '\t');
        if (q)
            *q = '\0';
@@ -682,7 +676,7 @@ nlist(void *notused, struct afs_nlist *nlp)
     return 0;
 }
 
-#endif
+#endif /* AFS_LINUX_ENV */
 
 #if    defined(AFS_SUN5_ENV)
 #ifdef _LP64
@@ -1829,7 +1823,7 @@ print_alloced_memlist(void)
     printf("Found %d elements in allocated memory list, expected %d\n", n,
           count);
 }
-#endif
+#endif /* AFS_LINUX_ENV */
 
 void
 print_allocs(int pnt)
@@ -2583,41 +2577,17 @@ print_vnode(int kmem, struct vnode *vep, struct vnode *ptr, int pnt)
        ("\ti_ino=%d, i_mode=%x, i_nlink=%d, i_uid=%d, i_gid=%d, i_size=%d\n",
         vep->i_ino, vep->i_mode, vep->i_nlink, vep->i_uid, vep->i_gid,
         vep->i_size);
-#ifdef AFS_LINUX_ENV
     printf
        ("\ti_atime=%u, i_mtime=%u, i_ctime=%u, i_version=%u, i_nrpages=%u\n",
         vep->i_atime, vep->i_mtime, vep->i_ctime, vep->i_version,
         vep->i_data.nrpages);
-#else
-    printf
-       ("\ti_atime=%u, i_mtime=%u, i_ctime=%u, i_version=%u, i_nrpages=%u\n",
-        vep->i_atime, vep->i_mtime, vep->i_ctime, vep->i_version,
-        vep->i_nrpages);
-#endif
-#ifdef AFS_LINUX_ENV
     printf("\ti_op=0x%x, i_rdev=0x%x, i_sb=0x%x\n", vep->i_op,
           vep->i_rdev, vep->i_sb);
-#else /* AFS_LINUX_ENV */
-    printf("\ti_op=0x%x, i_dev=0x%x, i_rdev=0x%x, i_sb=0x%x\n", vep->i_op,
-          vep->i_dev, vep->i_rdev, vep->i_sb);
-#endif /* AFS_LINUX_ENV */
-
-#ifdef AFS_LINUX_ENV
     printf("\ti_sem: count=%d, sleepers=%d, wait=0x%x\n", vep->i_sem.count,
           vep->i_sem.sleepers, vep->i_sem.wait);
-#else
-    printf("\ti_sem: count=%d, waking=%d, wait=0x%x\n", vep->i_sem.count,
-          vep->i_sem.waking, vep->i_sem.wait);
-#endif
-#ifdef AFS_LINUX_ENV
     printf("\ti_hash=0x%x:0x%x, i_list=0x%x:0x%x, i_dentry=0x%x:0x%x\n",
           vep->i_hash.pprev, vep->i_hash.next, vep->i_list.prev,
           vep->i_list.next, vep->i_dentry.prev, vep->i_dentry.next);
-#else /* AFS_LINUX_ENV */
-    printf("\ti_hash=0x%x:0x%x, i_list=0x%x:0x%x, i_dentry=0x%x:0x%x\n",
-          vep->i_hash.prev, vep->i_hash.next, vep->i_list.prev,
-          vep->i_list.next, vep->i_dentry.prev, vep->i_dentry.next);
-#endif /* AFS_LINUX_ENV */
 #endif /* AFS_LINUX_ENV */
 }