openafs-for-arla-20040708

FIXES 5490

allow use of openafs binaries with arla's linux 2.6 support

diff --git a/src/config/afs_args.h b/src/config/afs_args.h
index d2c21f3701c73c89733cb38d6423366efa90a2a7..6e0cd5505e487a9c4ace734a14fe0c9f752b9791 100644 (file)
--- a/src/config/afs_args.h
+++ b/src/config/afs_args.h
@@ -179,6 +179,7 @@ typedef struct cm_initparams_v1 {
 #define PROC_FSDIRNAME "openafs"
 #define PROC_SYSCALL_NAME "afs_ioctl"
 #define PROC_SYSCALL_FNAME "/proc/fs/openafs/afs_ioctl"
+#define PROC_SYSCALL_ARLA_FNAME "/proc/fs/nnpfs/afs_ioctl"
 #define VIOC_SYSCALL_TYPE 'C' 
 #define VIOC_SYSCALL _IOW(VIOC_SYSCALL_TYPE,1,void *)
  

diff --git a/src/sys/afssyscalls.c b/src/sys/afssyscalls.c
index 43e4992d457be8d2519b87dee948798a9d6cbaa7..7bb25a9ed28fe9ce6b158bb5415f830ae41d2241 100644 (file)
--- a/src/sys/afssyscalls.c
+++ b/src/sys/afssyscalls.c
@@ -319,7 +319,8 @@ int proc_afs_syscall(long syscall, long param1, long param2, long param3,
                     long param4, int *rval) {
   struct afsprocdata syscall_data;
   int fd = open(PROC_SYSCALL_FNAME, O_RDWR);
-
+  if(fd < 0)
+      fd = open(PROC_SYSCALL_ARLA_FNAME, O_RDWR);
   if(fd < 0)
     return -1;