#include <afsconfig.h>
#include "afs/param.h"
-RCSID
- ("$Header$");
#include "afs/sysincludes.h" /* Standard vendor system headers */
#include "afsincludes.h" /* Afs-based standard headers */
int afs_osicred_initialized = 0;
-struct AFS_UCRED afs_osi_cred;
+#ifndef AFS_FBSD80_ENV /* cr_groups is now malloc()'d */
+afs_ucred_t afs_osi_cred;
+#endif
afs_lock_t afs_xosi; /* lock is for tvattr */
extern struct osi_dev cacheDev;
extern struct mount *afs_cacheVfsp;
void *
-osi_UFSOpen(afs_int32 ainode)
+osi_UFSOpen(afs_dcache_id_t *ainode)
{
struct osi_file *afile;
struct vnode *vp;
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));
+ afile = osi_AllocSmallSpace(sizeof(struct osi_file));
AFS_GUNLOCK();
-#if defined(AFS_FBSD50_ENV)
- code = VFS_VGET(afs_cacheVfsp, (ino_t) ainode, LK_EXCLUSIVE, &vp);
-#else
- code = VFS_VGET(afs_cacheVfsp, (ino_t) ainode, &vp);
-#endif
+ code = VFS_VGET(afs_cacheVfsp, (ino_t) ainode->ufs, LK_EXCLUSIVE, &vp);
AFS_GLOCK();
if (code == 0 && vp->v_type == VNON)
code = ENOENT;
osi_FreeSmallSpace(afile);
osi_Panic("UFSOpen: igetinode failed");
}
-#if defined(AFS_FBSD50_ENV)
- VOP_UNLOCK(vp, 0, curthread);
+#if defined(AFS_FBSD80_ENV)
+ VOP_UNLOCK(vp, 0);
#else
- VOP_UNLOCK(vp, 0, curproc);
+ VOP_UNLOCK(vp, 0, curthread);
#endif
afile->vnode = vp;
afile->size = VTOI(vp)->i_size;
afile->offset = 0;
afile->proc = NULL;
- afile->inum = ainode; /* for hint validity checking */
return (void *)afile;
}
int
-afs_osi_Stat(register struct osi_file *afile, register struct osi_stat *astat)
+afs_osi_Stat(struct osi_file *afile, struct osi_stat *astat)
{
- register afs_int32 code;
+ afs_int32 code;
struct vattr tvattr;
AFS_STATCNT(osi_Stat);
- MObtainWriteLock(&afs_xosi, 320);
+ ObtainWriteLock(&afs_xosi, 320);
AFS_GUNLOCK();
-#if defined(AFS_FBSD50_ENV)
+#if defined(AFS_FBSD80_ENV)
+ vn_lock(afile->vnode, LK_EXCLUSIVE | LK_RETRY);
+ code = VOP_GETATTR(afile->vnode, &tvattr, afs_osi_credp);
+ VOP_UNLOCK(afile->vnode, 0);
+#else
vn_lock(afile->vnode, LK_EXCLUSIVE | LK_RETRY, curthread);
code = VOP_GETATTR(afile->vnode, &tvattr, afs_osi_credp, curthread);
VOP_UNLOCK(afile->vnode, LK_EXCLUSIVE, curthread);
-#else
- code = VOP_GETATTR(afile->vnode, &tvattr, afs_osi_credp, curproc);
#endif
AFS_GLOCK();
if (code == 0) {
astat->size = tvattr.va_size;
- astat->blksize = tvattr.va_blocksize;
astat->mtime = tvattr.va_mtime.tv_sec;
astat->atime = tvattr.va_atime.tv_sec;
}
- MReleaseWriteLock(&afs_xosi);
+ ReleaseWriteLock(&afs_xosi);
return code;
}
int
-osi_UFSClose(register struct osi_file *afile)
+osi_UFSClose(struct osi_file *afile)
{
AFS_STATCNT(osi_Close);
if (afile->vnode) {
}
int
-osi_UFSTruncate(register struct osi_file *afile, afs_int32 asize)
+osi_UFSTruncate(struct osi_file *afile, afs_int32 asize)
{
struct vattr tvattr;
struct vnode *vp;
- register afs_int32 code;
+ afs_int32 code, glocked;
AFS_STATCNT(osi_Truncate);
- MObtainWriteLock(&afs_xosi, 321);
+ ObtainWriteLock(&afs_xosi, 321);
vp = afile->vnode;
/*
* This routine only shrinks files, and most systems
* have very slow truncates, even when the file is already
* small enough. Check now and save some time.
*/
- AFS_GUNLOCK();
-#if defined(AFS_FBSD50_ENV)
+ glocked = ISAFS_GLOCK();
+ if (glocked)
+ AFS_GUNLOCK();
+#if defined(AFS_FBSD80_ENV)
+ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+ code = VOP_GETATTR(afile->vnode, &tvattr, afs_osi_credp);
+#else
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
code = VOP_GETATTR(afile->vnode, &tvattr, afs_osi_credp, curthread);
-#else
- vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curproc);
- code = VOP_GETATTR(afile->vnode, &tvattr, afs_osi_credp, curproc);
#endif
if (code != 0 || tvattr.va_size <= asize)
goto out;
VATTR_NULL(&tvattr);
tvattr.va_size = asize;
-#if defined(AFS_FBSD50_ENV)
- code = VOP_SETATTR(vp, &tvattr, afs_osi_credp, curthread);
+#if defined(AFS_FBSD80_ENV)
+ code = VOP_SETATTR(vp, &tvattr, afs_osi_credp);
#else
- code = VOP_SETATTR(vp, &tvattr, afs_osi_credp, curproc);
+ code = VOP_SETATTR(vp, &tvattr, afs_osi_credp, curthread);
#endif
out:
-#if defined(AFS_FBSD50_ENV)
- VOP_UNLOCK(vp, LK_EXCLUSIVE, curthread);
+#if defined(AFS_FBSD80_ENV)
+ VOP_UNLOCK(vp, 0);
#else
- VOP_UNLOCK(vp, LK_EXCLUSIVE, curproc);
+ VOP_UNLOCK(vp, LK_EXCLUSIVE, curthread);
#endif
- AFS_GLOCK();
- MReleaseWriteLock(&afs_xosi);
+ if (glocked)
+ AFS_GLOCK();
+ ReleaseWriteLock(&afs_xosi);
return code;
}
/* Generic read interface */
int
-afs_osi_Read(register struct osi_file *afile, int offset, void *aptr,
+afs_osi_Read(struct osi_file *afile, int offset, void *aptr,
afs_int32 asize)
{
- unsigned int resid;
- register afs_int32 code;
+#if (__FreeBSD_version >= 900505 && __FreeBSD_Version < 1000000) ||__FreeBSD_version >= 1000009
+ ssize_t resid;
+#else
+ int resid;
+#endif
+ afs_int32 code;
AFS_STATCNT(osi_Read);
/**
if (!afs_shuttingdown)
osi_Panic("osi_Read called with null param");
else
- return EIO;
+ return -EIO;
}
if (offset != -1)
afile->offset += code;
osi_DisableAtimes(afile->vnode);
} else {
- afs_Trace2(afs_iclSetp, CM_TRACE_READFAILED, ICL_TYPE_INT32, resid,
+ afs_Trace2(afs_iclSetp, CM_TRACE_READFAILED, ICL_TYPE_INT32, (int)resid,
ICL_TYPE_INT32, code);
- code = -1;
+ if (code > 0) {
+ code = -code;
+ }
}
return code;
}
/* Generic write interface */
int
-afs_osi_Write(register struct osi_file *afile, afs_int32 offset, void *aptr,
+afs_osi_Write(struct osi_file *afile, afs_int32 offset, void *aptr,
afs_int32 asize)
{
- unsigned int resid;
- register afs_int32 code;
+#if (__FreeBSD_version >= 900505 && __FreeBSD_Version < 1000000) ||__FreeBSD_version >= 1000009
+ ssize_t resid;
+#else
+ int resid;
+#endif
+ afs_int32 code;
AFS_STATCNT(osi_Write);
if (!afile)
osi_Panic("afs_osi_Write called with null param");
code = asize - resid;
afile->offset += code;
} else {
- code = -1;
+ if (code > 0) {
+ code = -code;
+ }
}
if (afile->proc) {
(*afile->proc) (afile, code);
This routine written from the RT NFS port strategy routine.
It has been generalized a bit, but should still be pretty clear. */
int
-afs_osi_MapStrategy(int (*aproc) (), register struct buf *bp)
+afs_osi_MapStrategy(int (*aproc) (), struct buf *bp)
{
afs_int32 returnCode;
void
shutdown_osifile(void)
{
- extern int afs_cold_shutdown;
-
AFS_STATCNT(shutdown_osifile);
if (afs_cold_shutdown) {
afs_osicred_initialized = 0;
git://git.openafs.org / openafs.git / blobdiff