linux-2626-updates-20080612

LICENSE IPL10
FIXES 102821

fixes which went into 1.4.x already

diff --git a/src/afs/LINUX/osi_pag_module.c b/src/afs/LINUX/osi_pag_module.c
index 8bea5d1..0395a2f 100644 (file)
--- a/src/afs/LINUX/osi_pag_module.c
+++ b/src/afs/LINUX/osi_pag_module.c
@@ -75,6 +75,9 @@ int
 init_module(void)
 #endif
 {
+#if !defined(EXPORTED_PROC_ROOT_FS) && defined(AFS_LINUX24_ENV)
+    char path[64];
+#endif
     int err;
 
     osi_Init();
@@ -83,7 +86,12 @@ init_module(void)
     if (err)
        return err;
 #ifdef AFS_LINUX24_ENV
+#if defined(EXPORTED_PROC_ROOT_FS)
     openafs_procfs = proc_mkdir(PROC_FSDIRNAME, proc_root_fs);
+#else
+    sprintf(path, "fs/%s", PROC_FSDIRNAME);
+    openafs_procfs = proc_mkdir(path, NULL);
+#endif
     osi_ioctl_init();
 #endif
 
@@ -102,13 +110,21 @@ void
 cleanup_module(void)
 #endif
 {
+#if !defined(EXPORTED_PROC_ROOT_FS) && defined(AFS_LINUX24_ENV)
+    char path[64];
+#endif
     osi_syscall_clean();
 
     osi_linux_free_afs_memory();
 
 #ifdef AFS_LINUX24_ENV
     osi_ioctl_clean();
+#if defined(EXPORTED_PROC_ROOT_FS)
     remove_proc_entry(PROC_FSDIRNAME, proc_root_fs);
+#else
+    sprintf(path, "fs/%s", PROC_FSDIRNAME);
+    remove_proc_entry(path, NULL);
+#endif
 #endif
     return;
 }

diff --git a/src/afs/LINUX/osi_sysctl.c b/src/afs/LINUX/osi_sysctl.c
index e0b3f5e..4ee95a4 100644 (file)
--- a/src/afs/LINUX/osi_sysctl.c
+++ b/src/afs/LINUX/osi_sysctl.c
@@ -108,7 +108,11 @@ static ctl_table afs_sysctl_table[] = {
        .proc_handler   = &proc_dointvec
     },
     {
+#if defined(SYSCTL_TABLE_CHECKING)
+       .ctl_name       = CTL_UNNUMBERED, 
+#else
        .ctl_name       = 7, 
+#endif
        .procname       = "afs_blocksUsed",
        .data           = &afs_blocksUsed,
        .maxlen         = sizeof(afs_int32), 
@@ -116,7 +120,11 @@ static ctl_table afs_sysctl_table[] = {
        .proc_handler   = &proc_dointvec
     },
     {
+#if defined(SYSCTL_TABLE_CHECKING)
+       .ctl_name       = CTL_UNNUMBERED, 
+#else
        .ctl_name       = 8, 
+#endif
        .procname       = "afs_blocksUsed_0",
        .data           = &afs_blocksUsed_0,
        .maxlen         = sizeof(afs_int32),
@@ -124,7 +132,11 @@ static ctl_table afs_sysctl_table[] = {
        .proc_handler   = &proc_dointvec
     },
     {
+#if defined(SYSCTL_TABLE_CHECKING)
+       .ctl_name       = CTL_UNNUMBERED, 
+#else
        .ctl_name       = 9, 
+#endif
        .procname       = "afs_blocksUsed_1",
        .data           = &afs_blocksUsed_1, 
        .maxlen         = sizeof(afs_int32),
@@ -132,7 +144,11 @@ static ctl_table afs_sysctl_table[] = {
        .proc_handler   = &proc_dointvec
     },
     {
+#if defined(SYSCTL_TABLE_CHECKING)
+       .ctl_name       = CTL_UNNUMBERED, 
+#else
        .ctl_name       = 10, 
+#endif
        .procname       = "afs_blocksUsed_2",
        .data           = &afs_blocksUsed_2, 
        .maxlen         = sizeof(afs_int32), 
@@ -140,7 +156,11 @@ static ctl_table afs_sysctl_table[] = {
        .proc_handler   = &proc_dointvec
     },
     {
+#if defined(SYSCTL_TABLE_CHECKING)
+       .ctl_name       = CTL_UNNUMBERED, 
+#else
        .ctl_name       = 11, 
+#endif
        .procname       = "afs_pct1",
        .data           = &afs_pct1, 
        .maxlen         = sizeof(afs_int32),
@@ -148,7 +168,11 @@ static ctl_table afs_sysctl_table[] = {
        .proc_handler   = &proc_dointvec
     },
     {
+#if defined(SYSCTL_TABLE_CHECKING)
+       .ctl_name       = CTL_UNNUMBERED, 
+#else
        .ctl_name       = 12, 
+#endif
        .procname       = "afs_pct2",
        .data           = &afs_pct2, 
        .maxlen         = sizeof(afs_int32),
@@ -156,7 +180,11 @@ static ctl_table afs_sysctl_table[] = {
        .proc_handler   = &proc_dointvec
     },
     {
+#if defined(SYSCTL_TABLE_CHECKING)
+       .ctl_name       = CTL_UNNUMBERED, 
+#else
        .ctl_name       = 13,
+#endif
        .procname       = "afs_cacheBlocks",
        .data           = &afs_cacheBlocks,
        .maxlen         = sizeof(afs_int32),
@@ -164,7 +192,11 @@ static ctl_table afs_sysctl_table[] = {
        .proc_handler   = &proc_dointvec
     },
     {
+#if defined(SYSCTL_TABLE_CHECKING)
+       .ctl_name       = CTL_UNNUMBERED, 
+#else
        .ctl_name       = 14, 
+#endif
        .procname       = "md5inum",
        .data           = &afs_new_inum, 
        .maxlen         = sizeof(afs_int32),