From fced68ddd004595a13984f23f0f5a3441b9978cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Tue, 11 Apr 2006 08:12:29 +0000
Subject: [PATCH] use afs_ioctlnum, From Tomas Olsson <tol@it.su.se>

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17050 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/kafs/afssys.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/kafs/afssys.c b/lib/kafs/afssys.c
index 7fa8f3502..7f85fbc05 100644
--- a/lib/kafs/afssys.c
+++ b/lib/kafs/afssys.c
@@ -198,8 +198,8 @@ try_ioctlpath(const char *path, unsigned long ioctlnum, int entrypoint)
 	 saved_errno != EDOM && 
 	 saved_errno != ENOTCONN))
 	return 1;
-    afs_ioctlpath = strdup(path);
     afs_ioctlnum = ioctlnum;
+    afs_ioctlpath = strdup(path);
     if (afs_ioctlpath == NULL)
 	return 1;
     afs_entry_point = entrypoint;
@@ -207,7 +207,7 @@ try_ioctlpath(const char *path, unsigned long ioctlnum, int entrypoint)
 }
 
 static int
-do_ioctl(void *data, unsigned long cmd)
+do_ioctl(void *data)
 {
     int fd, ret, saved_errno;
     fd = open(afs_ioctlpath, O_RDWR);
@@ -215,7 +215,7 @@ do_ioctl(void *data, unsigned long cmd)
 	errno = EINVAL;
 	return -1;
     }
-    ret = ioctl(fd, cmd, data);
+    ret = ioctl(fd, afs_ioctlnum, data);
     saved_errno = errno;
     close(fd);
     errno = saved_errno;
@@ -248,7 +248,7 @@ k_pioctl(char *a_path,
 	data.param2 = (unsigned long)o_opcode;
 	data.param3 = (unsigned long)a_paramsP;
 	data.param4 = (unsigned long)a_followSymlinks;
-	return do_ioctl(&data, VIOC_SYSCALL_PROC);
+	return do_ioctl(&data);
     }
     case MACOS_DEV_POINT: {
 	struct devdata data = { AFSCALL_PIOCTL, 0, 0, 0, 0, 0, 0, 0 };
@@ -259,7 +259,7 @@ k_pioctl(char *a_path,
 	data.param3 = (unsigned long)a_paramsP;
 	data.param4 = (unsigned long)a_followSymlinks;
 	
-	ret = do_ioctl(&data, VIOC_SYSCALL_DEV);
+	ret = do_ioctl(&data);
 	if (ret)
 	    return ret;
 	
@@ -314,11 +314,11 @@ k_setpag(void)
 #endif
     case LINUX_PROC_POINT: {
 	struct procdata data = { 0, 0, 0, 0, AFSCALL_SETPAG };
-	return do_ioctl(&data, VIOC_SYSCALL_PROC);
+	return do_ioctl(&data);
     }
     case MACOS_DEV_POINT: {
 	struct devdata data = { AFSCALL_SETPAG, 0, 0, 0, 0, 0, 0, 0 };
-	int ret = do_ioctl(&data, VIOC_SYSCALL_DEV);
+	int ret = do_ioctl(&data);
 	if (ret)
 	    return ret;
 	return data.retval;