/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
#include <afsconfig.h>
#include "afs/param.h"
-
#include "afs/sysincludes.h" /* Standard vendor system headers */
-#include "afsincludes.h" /* Afs-based standard headers */
+#include "afs/afsincludes.h" /* Afs-based standard headers */
#include "afs/afs_stats.h" /* afs statistics */
-int afs_osicred_initialized = 0;
-AFS_UCRED afs_osi_cred;
+int afs_osicred_initialized;
afs_lock_t afs_xosi; /* lock is for tvattr */
extern struct osi_dev cacheDev;
extern struct mount *afs_cacheVfsp;
-
void *
osi_UFSOpen(afs_dcache_id_t *ainode)
{
- struct inode *ip;
- register struct osi_file *afile = NULL;
+ struct osi_file *afile;
+ struct vnode *vp;
extern int cacheDiskType;
- afs_int32 code = 0;
- int dummy;
+ afs_int32 code;
+
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();
- code =
- igetinode(afs_cacheVfsp, (dev_t) cacheDev.dev, ainode->ufs, &ip,
- &dummy);
+ code = VFS_VGET(cacheDev.mp, (ino_t) ainode->ufs, &vp);
AFS_GLOCK();
+ if (code == 0 && vp->v_type == VNON)
+ code = ENOENT;
if (code) {
osi_FreeSmallSpace(afile);
osi_Panic("UFSOpen: igetinode failed");
}
- IN_UNLOCK(ip);
- afile->vnode = ITOV(ip);
- afile->size = VTOI(afile->vnode)->i_size;
+#if defined(AFS_NBSD60_ENV)
+ VOP_UNLOCK(vp);
+#else
+ VOP_UNLOCK(vp, 0);
+#endif
+ afile->vnode = vp;
+ afile->size = VTOI(vp)->i_ffs1_size;
afile->offset = 0;
- afile->proc = (int (*)())0;
- afile->inum = ainode->ufs; /* for hint validity checking */
+ afile->proc = NULL;
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();
- VOP_GETATTR(afile->vnode, &tvattr, afs_osi_credp, code);
+#ifdef AFS_NBSD50_ENV
+ code = VOP_GETATTR(afile->vnode, &tvattr, afs_osi_credp);
+#else
+ code = VOP_GETATTR(afile->vnode, &tvattr, afs_osi_credp,
+ osi_curproc());
+#endif
AFS_GLOCK();
if (code == 0) {
- astat->size = tvattr.va_size;
+ astat->size = afile->size = tvattr.va_size;
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) {
+
+ if (afile->vnode)
AFS_RELE(afile->vnode);
- }
osi_FreeSmallSpace(afile);
return 0;
}
int
-osi_UFSTruncate(register struct osi_file *afile, afs_int32 asize)
+osi_UFSTruncate(struct osi_file *afile, afs_int32 asize)
{
- AFS_UCRED *oldCred;
struct vattr tvattr;
- register afs_int32 code;
+ afs_int32 code;
struct osi_stat tstat;
+
AFS_STATCNT(osi_Truncate);
- /* This routine only shrinks files, and most systems
+ /*
+ * 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.
*/
code = afs_osi_Stat(afile, &tstat);
if (code || tstat.size <= asize)
return code;
- MObtainWriteLock(&afs_xosi, 321);
+
+ ObtainWriteLock(&afs_xosi, 321);
VATTR_NULL(&tvattr);
- /* note that this credential swapping stuff is only necessary because
- * of ufs's references directly to cred instead of to
- * credentials parameter. Probably should fix ufs some day. */
- oldCred = curproc->p_cred->pc_ucred; /* remember old credentials pointer */
- curproc->p_cred->pc_ucred = afs_osi_credp;
- /* temporarily use superuser credentials */
tvattr.va_size = asize;
AFS_GUNLOCK();
- VOP_SETATTR(afile->vnode, &tvattr, afs_osi_credp, code);
+ VOP_LOCK(afile->vnode, LK_EXCLUSIVE | LK_RETRY);
+#ifdef AFS_NBSD50_ENV
+ code = VOP_SETATTR(afile->vnode, &tvattr, afs_osi_credp);
+#else
+ code = VOP_SETATTR(afile->vnode, &tvattr, afs_osi_credp,
+ osi_curproc());
+#endif
+#ifdef AFS_NBSD60_ENV
+ VOP_UNLOCK(afile->vnode);
+#else
+ VOP_UNLOCK(afile->vnode, 0);
+#endif
AFS_GLOCK();
- curproc->p_cred->pc_ucred = oldCred; /* restore */
- MReleaseWriteLock(&afs_xosi);
+ if (code == 0)
+ afile->size = asize;
+ ReleaseWriteLock(&afs_xosi);
return code;
}
void
osi_DisableAtimes(struct vnode *avp)
{
- struct inode *ip = VTOI(avp);
- ip->i_flag &= ~IACC;
+#if 0
+ VTOI(avp)->i_flag &= ~IN_ACCESS;
+#endif
}
/* Generic read interface */
int
-afs_osi_Read(register struct osi_file *afile, int offset, void *aptr,
- afs_int32 asize)
+afs_osi_Read(struct osi_file *afile, int offset, void *aptr, afs_int32 asize)
{
- AFS_UCRED *oldCred;
- unsigned int resid;
- register afs_int32 code;
- register afs_int32 cnt1 = 0;
+ size_t resid;
+ afs_int32 code;
+
AFS_STATCNT(osi_Read);
- /**
- * If the osi_file passed in is NULL, panic only if AFS is not shutting
- * down. No point in crashing when we are already shutting down
- */
+ /*
+ * If the osi_file passed in is NULL, panic only if AFS is not shutting
+ * down. No point in crashing when we are already shutting down
+ */
if (!afile) {
if (!afs_shuttingdown)
osi_Panic("osi_Read called with null param");
else
- return EIO;
+ return -EIO;
}
if (offset != -1)
afile->offset = offset;
AFS_GUNLOCK();
code =
- gop_rdwr(UIO_READ, afile->vnode, (caddr_t) aptr, asize, afile->offset,
- AFS_UIOSYS, IO_UNIT, afs_osi_credp, &resid);
+ vn_rdwr(UIO_READ, afile->vnode, aptr, asize, afile->offset,
+ AFS_UIOSYS, IO_UNIT, afs_osi_credp, &resid,
+ osi_curproc());
AFS_GLOCK();
if (code == 0) {
code = asize - resid;
} else {
afs_Trace2(afs_iclSetp, CM_TRACE_READFAILED, ICL_TYPE_INT32, resid,
ICL_TYPE_INT32, code);
- code = -1;
+ if (code > 0) {
+ code *= -1;
+ }
}
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)
{
- AFS_UCRED *oldCred;
- unsigned int resid;
- register afs_int32 code;
+ size_t resid;
+ afs_int32 code;
+
AFS_STATCNT(osi_Write);
if (!afile)
- osi_Panic("afs_osi_Write called with null param");
+ osi_Panic("afs_osi_Write called with null afile");
if (offset != -1)
afile->offset = offset;
- {
- struct ucred *tmpcred = curproc->p_cred->pc_ucred;
- curproc->p_cred->pc_ucred = afs_osi_credp;
- AFS_GUNLOCK();
- code =
- gop_rdwr(UIO_WRITE, afile->vnode, (caddr_t) aptr, asize,
- afile->offset, AFS_UIOSYS, IO_UNIT, afs_osi_credp,
- &resid);
- AFS_GLOCK();
- curproc->p_cred->pc_ucred = tmpcred;
- }
+
+ AFS_GUNLOCK();
+ code =
+ vn_rdwr(UIO_WRITE, afile->vnode, aptr, asize, afile->offset,
+ AFS_UIOSYS, IO_UNIT, afs_osi_credp, &resid, osi_curproc());
+ AFS_GLOCK();
+
if (code == 0) {
code = asize - resid;
afile->offset += code;
+ if (afile->offset > afile->size)
+ afile->size = afile->offset;
} else {
- code = -1;
+ if (code > 0) {
+ code *= -1;
+ }
}
- if (afile->proc) {
+
+ if (afile->proc)
(*afile->proc) (afile, code);
- }
+
return code;
}
-
-/* This work should be handled by physstrat in ca/machdep.c.
- This routine written from the RT NFS port strategy routine.
- It has been generalized a bit, but should still be pretty clear. */
+/*
+ * This work should be handled by physstrat in ca/machdep.c. 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 *), struct buf *bp)
{
afs_int32 returnCode;
return returnCode;
}
-
-
void
shutdown_osifile(void)
{
AFS_STATCNT(shutdown_osifile);
- if (afs_cold_shutdown) {
+ if (afs_cold_shutdown)
afs_osicred_initialized = 0;
- }
}
git://git.openafs.org / openafs.git / blobdiff