jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 23:10:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

snowleopard fuse fallout

Browse Source 
didn't notice in testing that 64 bit version of afsd got slaughtered.

put it back.

Change-Id: I3a6588df36a31ab014d79faf4ed5646339f6f84b
Reviewed-on: http://gerrit.openafs.org/1757
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Derrick Brashear 2010-04-15 01:29:31 -04:00
parent ab2005d719
commit 72aab36e10
1 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/afsd/afsd_kernel.c
View File

@ -196,22 +196,51 @@ afsd_call_syscall(long param1, long param2, long param3, long param4, long param
# endif /* AFS_LINUX20_ENV */
# ifdef AFS_DARWIN80_ENV
struct afssysargs syscall_data;
void *ioctldata;
int fd = open(SYSCALL_DEV_FNAME,O_RDWR);
syscall_data.syscall = AFSCALL_CALL;
syscall_data.param1 = param1;
syscall_data.param2 = param2;
syscall_data.param3 = param3;
syscall_data.param4 = param4;
syscall_data.param5 = param5;
syscall_data.param6 = param6;
if(fd >= 0) {
error = ioctl(fd, VIOC_SYSCALL, &syscall_data);
close(fd);
int syscallnum;
#ifdef AFS_DARWIN100_ENV
int is64 = 0;
struct afssysargs64 syscall64_data;
if (sizeof(param1) == 8) {
syscallnum = VIOC_SYSCALL64;
is64 = 1;
ioctldata = &syscall64_data;
syscall64_data.syscall = (int)AFSCALL_CALL;
syscall64_data.param1 = param1;
syscall64_data.param2 = param2;
syscall64_data.param3 = param3;
syscall64_data.param4 = param4;
syscall64_data.param5 = param5;
syscall64_data.param6 = param6;
} else {
error = -1;
#endif
syscallnum = VIOC_SYSCALL;
ioctldata = &syscall_data;
syscall_data.syscall = AFSCALL_CALL;
syscall_data.param1 = param1;
syscall_data.param2 = param2;
syscall_data.param3 = param3;
syscall_data.param4 = param4;
syscall_data.param5 = param5;
syscall_data.param6 = param6;
#ifdef AFS_DARWIN100_ENV
}
#endif
if(fd >= 0) {
error = ioctl(fd, syscallnum, ioctldata);
close(fd);
} else {
error = -1;
}
if (!error) {
#ifdef AFS_DARWIN100_ENV
if (is64)
error=syscall64_data.retval;
else
#endif
error=syscall_data.retval;
}
if (!error)
error=syscall_data.retval;
# else /* AFS_DARWIN80_ENV */
error =
syscall(AFS_SYSCALL, AFSCALL_CALL, param1, param2, param3, param4,