DEVEL15-fbsd-ustrategy-20090122

LICENSE IPL10

make freebsd ustrategy correct

(cherry picked from commit 6742f2054ac96bcec19c01d408542c94de9a55f1)

diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c
index 2b401de8ff2410b0b27b8504f9591a5b43b035d3..146e09fc9dc038c3ab9e653e061a4b428a10d5cb 100644 (file)
--- a/src/afs/FBSD/osi_vnodeops.c
+++ b/src/afs/FBSD/osi_vnodeops.c
@@ -1558,7 +1558,7 @@ afs_vop_strategy(ap)
 {
     int error;
     AFS_GLOCK();
-    error = afs_ustrategy(ap->a_bp);
+    error = afs_ustrategy(ap->a_bp, osi_cred());
     AFS_GUNLOCK();
     return error;
 }

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 3ca0d3af7d2cf969925ef65a9389d7f7df9c345e..2d09add169df352ed53ed2cf4c19e2762567e6ee 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -1203,7 +1203,7 @@ extern int afs_rename(OSI_VC_DECL(aodp), char *aname1, struct vcache *andp,
 #endif
        
 /* VNOPS/afs_vnop_strategy.c */
-#if defined(AFS_SUN5_ENV) || defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV)
+#if defined(AFS_SUN5_ENV) || defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
 extern int afs_ustrategy(register struct buf *adp, struct AFS_UCRED *credp);
 #else
 extern int afs_ustrategy(register struct buf *adp);