From: Andrew Deason <adeason@sinenomine.net>
Date: Thu, 30 Jul 2009 17:43:27 +0000 (-0400)
Subject: Fix UKERNEL afs_mount arguments
X-Git-Tag: openafs-devel-1_5_61~4
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=152e9152ff8bef4efac822b5a43b33ba50e8eed5;p=packages%2Fo%2Fopenafs.git

Fix UKERNEL afs_mount arguments

Change 73 (commit dc6299f5) changed the order of arguments for the
UKERNEL implementation of afs_mount, causing uafs_mount to segfault
whenever called. This changes them back to what they were before.

Reviewed-on: http://gerrit.openafs.org/256
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/afs/UKERNEL/osi_vfsops.c b/src/afs/UKERNEL/osi_vfsops.c
index 8910dbebc..16d7d507f 100644
--- a/src/afs/UKERNEL/osi_vfsops.c
+++ b/src/afs/UKERNEL/osi_vfsops.c
@@ -36,7 +36,7 @@ int afs_rootCellIndex = 0;
 #endif
 
 int
-afs_mount(struct vfs *path, char *data, struct vfs *afsp)
+afs_mount(struct vfs *afsp, char *path, void *data)
 {
     AFS_STATCNT(afs_mount);
 
diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 3559de579..7190d7207 100644
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -750,7 +750,7 @@ extern void vcache2fakeinode(struct vcache *rootvp, struct vcache *mpvp);
 #endif
 
 #ifdef UKERNEL
-extern int afs_mount(struct vfs *path, char *data, struct vfs *afsp);
+extern int afs_mount(struct vfs *afsp, char *path, void *data);
 extern int afs_root(OSI_VFS_DECL(afsp), struct vnode **avpp);
 extern int afs_unmount(struct vfs *afsp);
 #endif