freebsd50-20030909

use VFS_VGET with correct args instead of igetinode
fix str warnings in dir.c

diff --git a/src/afs/FBSD/osi_file.c b/src/afs/FBSD/osi_file.c
index febfd6a..ffc08ce 100644 (file)
--- a/src/afs/FBSD/osi_file.c
+++ b/src/afs/FBSD/osi_file.c
@@ -33,23 +33,28 @@ osi_UFSOpen(afs_int32 ainode)
     extern int cacheDiskType;
     afs_int32 code = 0;
     int dummy;
+
     AFS_STATCNT(osi_UFSOpen);
     if (cacheDiskType != AFS_FCACHE_TYPE_UFS)
        osi_Panic("UFSOpen called for non-UFS cache\n");
     afile = (struct osi_file *)osi_AllocSmallSpace(sizeof(struct osi_file));
     AFS_GUNLOCK();
+#if defined(AFS_FBSD50_ENV)
+    code = VFS_VGET(afs_cacheVfsp, (ino_t) ainode, LK_EXCLUSIVE, &afile->vnode);
+#else
     code =
        igetinode(afs_cacheVfsp, (dev_t) cacheDev.dev, (ino_t) ainode, &ip,
                  &dummy);
+#endif
     AFS_GLOCK();
     if (code) {
        osi_FreeSmallSpace(afile);
        osi_Panic("UFSOpen: igetinode failed");
     }
-    afile->vnode = ITOV(ip);
 #if defined(AFS_FBSD50_ENV)
     VOP_UNLOCK(afile->vnode, 0, curthread);
 #else
+    afile->vnode = ITOV(ip);
     VOP_UNLOCK(afile->vnode, 0, curproc);
 #endif
     afile->size = VTOI(afile->vnode)->i_size;

diff --git a/src/dir/dir.c b/src/dir/dir.c
index 157661b..0a53a54 100644 (file)
--- a/src/dir/dir.c
+++ b/src/dir/dir.c
@@ -36,6 +36,7 @@ RCSID
 #include "afs/sysincludes.h"
 #endif
 #if defined(AFS_FBSD_ENV)
+#include "h/libkern.h"
 #include "h/lock.h"
 #include "vm/vm.h"
 #include "vm/vm_extern.h"