From: Love Hörnquist-Åstrand <lha@stacken.kth.se>
Date: Thu, 8 Jul 2004 06:35:26 +0000 (+0000)
Subject: openafs-for-arla-20040708
X-Git-Tag: openafs-devel-1_3_66~65
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3fb32a2561e3171761e7b434cde1da4d37b2aef2;p=packages%2Fo%2Fopenafs.git

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 d2c21f370..6e0cd5505 100644
--- 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 43e4992d4..7bb25a9ed 100644
--- 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;