source: server/common/patches/openafs-2626.patch @ 866

Last change on this file since 866 was 839, checked in by andersk, 14 years ago
Make openafs build on 2.6.26.
File size: 4.8 KB
  • openafs/acinclude.m4

    RCS file: /cvs/openafs/acinclude.m4,v
    retrieving revision 1.114.2.101
    retrieving revision 1.114.2.102
    diff -u -r1.114.2.101 -r1.114.2.102
     
    600600
    601601                 LINUX_KBUILD_USES_EXTRA_CFLAGS
    602602                 LINUX_KERNEL_COMPILE_WORKS
     603                 LINUX_EXPORTS_FIND_TASK_BY_PID
     604                 LINUX_EXPORTS_PROC_ROOT_FS
    603605                 LINUX_HAVE_CURRENT_KERNEL_TIME
    604606                 LINUX_KMEM_CACHE_INIT
    605607                 LINUX_HAVE_KMEM_CACHE_T
  • openafs/src/afs/LINUX/osi_groups.c

    RCS file: /cvs/openafs/src/afs/LINUX/osi_groups.c,v
    retrieving revision 1.25.2.15
    retrieving revision 1.25.2.16
    diff -u -r1.25.2.15 -r1.25.2.16
     
    2020#endif
    2121
    2222RCSID
    23     ("$Header: /cvs/openafs/src/afs/LINUX/osi_groups.c,v 1.25.2.15 2008/04/19 21:56:11 shadow Exp $");
     23    ("$Header: /cvs/openafs/src/afs/LINUX/osi_groups.c,v 1.25.2.16 2008/06/09 03:39:44 shadow Exp $");
    2424
    2525#include "afs/sysincludes.h"
    2626#include "afsincludes.h"
     
    646646#  endif
    647647            rcu_read_lock();
    648648# endif
     649#if defined(EXPORTED_FIND_TASK_BY_PID)
    649650        p = find_task_by_pid(1);
     651#else
     652        p = find_task_by_vpid(1);
     653#endif
    650654        if (p && p->user->session_keyring)
    651655            __key_type_keyring = p->user->session_keyring->type;
    652656# ifdef EXPORTED_TASKLIST_LOCK
  • openafs/src/afs/LINUX/osi_module.c

    RCS file: /cvs/openafs/src/afs/LINUX/osi_module.c,v
    retrieving revision 1.52.2.29
    retrieving revision 1.52.2.30
    diff -u -r1.52.2.29 -r1.52.2.30
     
    1515#include "afs/param.h"
    1616
    1717RCSID
    18     ("$Header: /cvs/openafs/src/afs/LINUX/osi_module.c,v 1.52.2.29 2007/10/24 18:09:50 shadow Exp $");
     18    ("$Header: /cvs/openafs/src/afs/LINUX/osi_module.c,v 1.52.2.30 2008/06/09 03:39:44 shadow Exp $");
    1919
    2020#include <linux/module.h> /* early to avoid printf->printk mapping */
    2121#include "afs/sysincludes.h"
     
    237237{
    238238    struct proc_dir_entry *entry1;
    239239    struct proc_dir_entry *entry2;
     240#if !defined(EXPORTED_PROC_ROOT_FS)
     241    char path[64];
     242#endif
    240243
     244#if defined(EXPORTED_PROC_ROOT_FS)
    241245    openafs_procfs = proc_mkdir(PROC_FSDIRNAME, proc_root_fs);
     246#else
     247    sprintf(path, "fs/%s", PROC_FSDIRNAME);
     248    openafs_procfs = proc_mkdir(path, NULL);
     249#endif
    242250    entry1 = create_proc_entry(PROC_SYSCALL_NAME, 0666, openafs_procfs);
    243251
    244252    entry1->proc_fops = &afs_syscall_fops;
     
    263271static void
    264272afsproc_exit(void)
    265273{
     274#if !defined(EXPORTED_PROC_ROOT_FS)
     275    char path[64];
     276#endif
     277
     278#if defined(EXPORTED_PROC_ROOT_FS)
     279    remove_proc_entry(PROC_FSDIRNAME, proc_root_fs);
     280#else
     281    sprintf(path, "fs/%s", PROC_FSDIRNAME);
     282    remove_proc_entry(path, NULL);
     283#endif
    266284    remove_proc_entry(PROC_CELLSERVDB_NAME, openafs_procfs);
    267285    remove_proc_entry(PROC_SYSCALL_NAME, openafs_procfs);
    268     remove_proc_entry(PROC_FSDIRNAME, proc_root_fs);
    269286#if defined(NEED_IOCTL32) && !defined(HAVE_COMPAT_IOCTL)
    270287    if (ioctl32_done)
    271288            unregister_ioctl32_conversion(VIOC_SYSCALL32);
  • openafs/src/cf/linux-test4.m4

    RCS file: /cvs/openafs/src/cf/linux-test4.m4,v
    retrieving revision 1.20.2.48
    retrieving revision 1.20.2.49
    diff -u -r1.20.2.48 -r1.20.2.49
     
    10051005    AC_DEFINE([EXPORTED_RCU_READ_LOCK], 1, [define if rcu_read_lock() is usable])
    10061006  fi])
    10071007 
     1008AC_DEFUN([LINUX_EXPORTS_FIND_TASK_BY_PID], [
     1009  AC_MSG_CHECKING([if find_task_by_pid is usable])
     1010  AC_CACHE_VAL([ac_cv_linux_exports_find_task_by_pid], [
     1011    AC_TRY_KBUILD(
     1012[#include <linux/sched.h>],
     1013[pid_t p;
     1014find_task_by_pid(p);],
     1015      ac_cv_linux_exports_find_task_by_pid=yes,
     1016      ac_cv_linux_exports_find_task_by_pid=no)])
     1017  AC_MSG_RESULT($ac_cv_linux_exports_find_task_by_pid)
     1018  if test "x$ac_cv_linux_exports_find_task_by_pid" = "xyes"; then
     1019    AC_DEFINE([EXPORTED_FIND_TASK_BY_PID], 1, [define if find_task_by_pid() is usable])
     1020  fi])
     1021 
     1022AC_DEFUN([LINUX_EXPORTS_PROC_ROOT_FS], [
     1023  AC_MSG_CHECKING([if proc_root_fs is defined and exported])
     1024  AC_CACHE_VAL([ac_cv_linux_exports_proc_root_fs], [
     1025    AC_TRY_KBUILD(
     1026[#include <linux/proc_fs.h>],
     1027[struct proc_dir_entry *p = proc_root_fs;],
     1028      ac_cv_linux_exports_proc_root_fs=yes,
     1029      ac_cv_linux_exports_proc_root_fs=no)])
     1030  AC_MSG_RESULT($ac_cv_linux_exports_proc_root_fs)
     1031  if test "x$ac_cv_linux_exports_proc_root_fs" = "xyes"; then
     1032    AC_DEFINE([EXPORTED_PROC_ROOT_FS], 1, [define if proc_root_fs is exported])
     1033  fi])
     1034 
Note: See TracBrowser for help on using the repository browser.