From: Andrew Deason <adeason@sinenomine.net>
Date: Thu, 4 Nov 2010 15:33:17 +0000 (-0500)
Subject: afsd: Pass cacheMountDir to aix_vmount
X-Git-Tag: upstream/1.8.0_pre1^2~4556
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8401d0281f833638c1cfc5cb862d77fe97232ecb;p=packages%2Fo%2Fopenafs.git

afsd: Pass cacheMountDir to aix_vmount

cacheMountDir is no longer global, so aix_vmount() needs it passed as
an argument. Do so.

Change-Id: I26c56b49f5ec675277d137424f672f0b727f705d
Reviewed-on: http://gerrit.openafs.org/3259
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/afsd/afsd_kernel.c b/src/afsd/afsd_kernel.c
index f68a76e60..5f769e6ba 100644
--- a/src/afsd/afsd_kernel.c
+++ b/src/afsd/afsd_kernel.c
@@ -275,7 +275,7 @@ afsd_call_syscall(call, parm0, parm1, parm2, parm3, parm4, parm5, parm6)
 
 #define	ROUNDUP(x)  (((x) + 3) & ~3)
 
-aix_vmount()
+aix_vmount(const char *cacheMountDir)
 {
     struct vmount *vmountp;
     int size, error;
@@ -479,7 +479,7 @@ afsd_mount_afs(const char *rn, const char *cacheMountDir)
 #elif defined(AFS_FBSD_ENV)
     if ((mount("AFS", cacheMountDir, mountFlags, (caddr_t) 0)) < 0) {
 #elif defined(AFS_AIX_ENV)
-    if (aix_vmount()) {
+    if (aix_vmount(cacheMountDir)) {
 #elif defined(AFS_HPUX100_ENV)
     if ((mount("", cacheMountDir, mountFlags, "afs", NULL, 0)) < 0) {
 #elif defined(AFS_SUN5_ENV)