#include <afsconfig.h>
#include <afs/param.h>
-RCSID
- ("$Header$");
#include <afs/sysincludes.h> /* Standard vendor system headers */
#include <afsincludes.h> /* Afs-based standard headers */
#include <sys/malloc.h>
#include <sys/namei.h>
#include <sys/unistd.h>
-#ifndef AFS_FBSD50_ENV
-#include <vm/vm_zone.h>
-#endif
#include <vm/vm_page.h>
#include <vm/vm_object.h>
#include <vm/vm_pager.h>
static vop_strategy_t afs_vop_strategy;
static vop_symlink_t afs_vop_symlink;
static vop_write_t afs_vop_write;
-#if defined(AFS_FBSD70_ENV) && !defined(AFS_FBSD90_ENV)
+#if defined(AFS_FBSD70_ENV) && !defined(AFS_FBSD80_ENV)
static vop_lock1_t afs_vop_lock;
static vop_unlock_t afs_vop_unlock;
static vop_islocked_t afs_vop_islocked;
.vop_getpages = afs_vop_getpages,
.vop_inactive = afs_vop_inactive,
.vop_ioctl = afs_vop_ioctl,
+#if !defined(AFS_FBSD80_ENV)
+ /* removed at least temporarily (NFSv4 flux) */
.vop_lease = VOP_NULL,
+#endif
.vop_link = afs_vop_link,
.vop_lookup = afs_vop_lookup,
.vop_mkdir = afs_vop_mkdir,
.vop_strategy = afs_vop_strategy,
.vop_symlink = afs_vop_symlink,
.vop_write = afs_vop_write,
-#if defined(AFS_FBSD70_ENV) && !defined(AFS_FBSD90_ENV)
+#if defined(AFS_FBSD70_ENV) && !defined(AFS_FBSD80_ENV)
.vop_lock1 = afs_vop_lock,
.vop_unlock = afs_vop_unlock,
.vop_islocked = afs_vop_islocked,
int afs_vop_ioctl(struct vop_ioctl_args *);
static int afs_vop_pathconf(struct vop_pathconf_args *);
int afs_vop_poll(struct vop_poll_args *);
-#ifndef AFS_FBSD50_ENV
-int afs_vop_mmap(struct vop_mmap_args *);
-#endif
int afs_vop_fsync(struct vop_fsync_args *);
int afs_vop_remove(struct vop_remove_args *);
int afs_vop_link(struct vop_link_args *);
{&vop_access_desc, (vop_t *) afs_vop_access}, /* access */
{&vop_advlock_desc, (vop_t *) afs_vop_advlock}, /* advlock */
{&vop_bmap_desc, (vop_t *) afs_vop_bmap}, /* bmap */
-#ifndef AFS_FBSD50_ENV
- {&vop_bwrite_desc, (vop_t *) vop_stdbwrite},
-#endif
{&vop_close_desc, (vop_t *) afs_vop_close}, /* close */
{&vop_createvobject_desc, (vop_t *) vop_stdcreatevobject},
{&vop_destroyvobject_desc, (vop_t *) vop_stddestroyvobject},
{&vop_lookup_desc, (vop_t *) afs_vop_lookup}, /* lookup */
{&vop_mkdir_desc, (vop_t *) afs_vop_mkdir}, /* mkdir */
{&vop_mknod_desc, (vop_t *) afs_vop_mknod}, /* mknod */
-#ifndef AFS_FBSD50_ENV
- {&vop_mmap_desc, (vop_t *) afs_vop_mmap}, /* mmap */
-#endif
{&vop_open_desc, (vop_t *) afs_vop_open}, /* open */
{&vop_pathconf_desc, (vop_t *) afs_vop_pathconf}, /* pathconf */
{&vop_poll_desc, (vop_t *) afs_vop_poll}, /* select */
#define DROPNAME() FREE(name, M_TEMP)
-/* This is a bit of a cheat... */
-#ifdef AFS_FBSD50_ENV
-#define a_p a_td
-#endif
-
#if defined(AFS_FBSD80_ENV)
#define ma_vn_lock(vp, flags, p) (vn_lock(vp, flags))
#define MA_VOP_LOCK(vp, flags, p) (VOP_LOCK(vp, flags))
struct lock *lkp = vp->v_vnlock;
#ifdef AFS_FBSD80_ENV
- int code;
+ int code = 0;
u_int op;
op = ((ap->a_flags) | LK_RELEASE) & LK_TYPE_MASK;
int glocked = ISAFS_GLOCK();
register int flags = ap->a_cnp->cn_flags;
int lockparent; /* 1 => lockparent flag is set */
int wantparent; /* 1 => wantparent or lockparent flag */
-#ifdef AFS_FBSD50_ENV
struct thread *p = ap->a_cnp->cn_thread;
-#else
- struct proc *p = ap->a_cnp->cn_proc;
-#endif
dvp = ap->a_dvp;
if (dvp->v_type != VDIR) {
int error = 0;
struct vcache *vcp;
register struct vnode *dvp = ap->a_dvp;
-#ifdef AFS_FBSD50_ENV
struct thread *p = ap->a_cnp->cn_thread;
-#else
- struct proc *p = ap->a_cnp->cn_proc;
-#endif
GETNAME();
AFS_GLOCK();
* struct vnode *a_vp;
* int a_mode;
* struct ucred *a_cred;
- * struct proc *a_p;
+ * struct thread *a_td;
+ * struct file *a_fp;
* } */ *ap;
{
int error;
#endif
AFS_GUNLOCK();
#ifdef AFS_FBSD60_ENV
- vnode_create_vobject(ap->a_vp, vc->m.Length, ap->a_td);
+ vnode_create_vobject(ap->a_vp, vc->f.m.Length, ap->a_td);
#endif
osi_FlushPages(vc, ap->a_cred);
return error;
* struct vnode *a_vp;
* int a_fflag;
* struct ucred *a_cred;
- * struct proc *a_p;
+ * struct thread *a_td;
* } */ *ap;
{
int code;
afs_vop_access(ap)
struct vop_access_args /* {
* struct vnode *a_vp;
- * int a_mode;
+ * accmode_t a_accmode;
* struct ucred *a_cred;
- * struct proc *a_p;
+ * struct thread *a_td;
* } */ *ap;
{
int code;
AFS_GLOCK();
+#if defined(AFS_FBSD80_ENV)
+ code = afs_access(VTOAFS(ap->a_vp), ap->a_accmode, ap->a_cred);
+#else
code = afs_access(VTOAFS(ap->a_vp), ap->a_mode, ap->a_cred);
+#endif
AFS_GUNLOCK();
return code;
}
* struct vnode *a_vp;
* struct vattr *a_vap;
* struct ucred *a_cred;
- * struct proc *a_p;
* } */ *ap;
{
int code;
* struct vnode *a_vp;
* struct vattr *a_vap;
* struct ucred *a_cred;
- * struct proc *a_p;
* } */ *ap;
{
int code;
struct vnode *vp;
struct vcache *avc;
-#ifdef AFS_FBSD50_ENV
- GIANT_REQUIRED;
-#endif
vp = ap->a_vp;
avc = VTOAFS(vp);
if ((object = vp->v_object) == NULL) {
{
vm_page_t m = ap->a_m[ap->a_reqpage];
-#ifdef AFS_FBSD50_ENV
VM_OBJECT_LOCK(object);
vm_page_lock_queues();
-#endif
if (m->valid != 0) {
/* handled by vm_fault now */
/* vm_page_zero_invalid(m, TRUE); */
if (i != ap->a_reqpage)
vm_page_free(ap->a_m[i]);
}
-#ifdef AFS_FBSD50_ENV
vm_page_unlock_queues();
VM_OBJECT_UNLOCK(object);
-#endif
return (0);
}
-#ifdef AFS_FBSD50_ENV
vm_page_unlock_queues();
VM_OBJECT_UNLOCK(object);
-#endif
}
bp = getpbuf(&afs_pbuf_freecnt);
kva = (vm_offset_t) bp->b_data;
pmap_qenter(kva, ap->a_m, npages);
-#ifdef AFS_FBSD50_ENV
cnt.v_vnodein++;
cnt.v_vnodepgsin += npages;
-#endif
iov.iov_base = (caddr_t) kva;
iov.iov_len = ap->a_count;
uio.uio_resid = ap->a_count;
uio.uio_segflg = UIO_SYSSPACE;
uio.uio_rw = UIO_READ;
-#ifdef AFS_FBSD50_ENV
uio.uio_td = curthread;
-#else
- uio.uio_procp = curproc;
-#endif
AFS_GLOCK();
osi_FlushPages(avc, osi_curcred()); /* hold bozon lock, but not basic vnode lock */
relpbuf(bp, &afs_pbuf_freecnt);
if (code && (uio.uio_resid == ap->a_count)) {
-#ifdef AFS_FBSD50_ENV
VM_OBJECT_LOCK(object);
vm_page_lock_queues();
-#endif
for (i = 0; i < npages; ++i) {
if (i != ap->a_reqpage)
vm_page_free(ap->a_m[i]);
}
-#ifdef AFS_FBSD50_ENV
vm_page_unlock_queues();
VM_OBJECT_UNLOCK(object);
-#endif
return VM_PAGER_ERROR;
}
size = ap->a_count - uio.uio_resid;
-#ifdef AFS_FBSD50_ENV
VM_OBJECT_LOCK(object);
vm_page_lock_queues();
-#endif
for (i = 0, toff = 0; i < npages; i++, toff = nextoff) {
vm_page_t m;
nextoff = toff + PAGE_SIZE;
}
}
}
-#ifdef AFS_FBSD50_ENV
vm_page_unlock_queues();
VM_OBJECT_UNLOCK(object);
-#endif
return 0;
}
struct vnode *vp;
struct vcache *avc;
-#ifdef AFS_FBSD50_ENV
- GIANT_REQUIRED;
-#endif
-
vp = ap->a_vp;
avc = VTOAFS(vp);
/* Perhaps these two checks should just be KASSERTs instead... */
kva = (vm_offset_t) bp->b_data;
pmap_qenter(kva, ap->a_m, npages);
-#ifdef AFS_FBSD50_ENV
cnt.v_vnodeout++;
cnt.v_vnodepgsout += ap->a_count;
-#endif
iov.iov_base = (caddr_t) kva;
iov.iov_len = ap->a_count;
uio.uio_resid = ap->a_count;
uio.uio_segflg = UIO_SYSSPACE;
uio.uio_rw = UIO_WRITE;
-#ifdef AFS_FBSD50_ENV
uio.uio_td = curthread;
-#else
- uio.uio_procp = curproc;
-#endif
sync = IO_VMIO;
if (ap->a_sync & VM_PAGER_PUT_SYNC)
sync |= IO_SYNC;
afs_vop_ioctl(ap)
struct vop_ioctl_args /* {
* struct vnode *a_vp;
- * int a_command;
- * caddr_t a_data;
+ * u_long a_command;
+ * void *a_data;
* int a_fflag;
* struct ucred *a_cred;
- * struct proc *a_p;
+ * struct thread *a_td;
* } */ *ap;
{
struct vcache *tvc = VTOAFS(ap->a_vp);
* struct vnode *a_vp;
* int a_events;
* struct ucred *a_cred;
- * struct proc *a_p;
+ * struct thread *td;
* } */ *ap;
{
/*
* struct vnode *a_vp;
* int a_fflags;
* struct ucred *a_cred;
- * struct proc *a_p;
+ * struct thread *td;
* } */ *ap;
{
return (EINVAL);
afs_vop_fsync(ap)
struct vop_fsync_args /* {
* struct vnode *a_vp;
- * struct ucred *a_cred;
* int a_waitfor;
- * struct proc *a_p;
+ * struct thread *td;
* } */ *ap;
{
int error;
int error = 0;
register struct vnode *dvp = ap->a_tdvp;
register struct vnode *vp = ap->a_vp;
-#ifdef AFS_FBSD50_ENV
struct thread *p = ap->a_cnp->cn_thread;
-#else
- struct proc *p = ap->a_cnp->cn_proc;
-#endif
GETNAME();
if (dvp->v_mount != vp->v_mount) {
register struct vnode *tdvp = ap->a_tdvp;
struct vnode *fvp = ap->a_fvp;
register struct vnode *fdvp = ap->a_fdvp;
-#ifdef AFS_FBSD50_ENV
struct thread *p = fcnp->cn_thread;
-#else
- struct proc *p = fcnp->cn_proc;
-#endif
/*
* Check for cross-device rename.
register struct vattr *vap = ap->a_vap;
int error = 0;
struct vcache *vcp;
-#ifdef AFS_FBSD50_ENV
struct thread *p = ap->a_cnp->cn_thread;
-#else
- struct proc *p = ap->a_cnp->cn_proc;
-#endif
GETNAME();
#ifdef DIAGNOSTIC
error = afs_lookup(VTOAFS(dvp), name, &vcp, cnp->cn_cred);
if (error == 0) {
newvp = AFSTOV(vcp);
-#ifdef AFS_FBSD50_ENV
ma_vn_lock(newvp, LK_EXCLUSIVE | LK_RETRY, cnp->cn_thread);
-#else
- ma_vn_lock(newvp, LK_EXCLUSIVE | LK_RETRY, cnp->cn_proc);
-#endif
}
}
AFS_GUNLOCK();
afs_vop_inactive(ap)
struct vop_inactive_args /* {
* struct vnode *a_vp;
- * struct proc *a_p;
+ * struct thread *td;
* } */ *ap;
{
register struct vnode *vp = ap->a_vp;
AFS_GLOCK();
afs_InactiveVCache(VTOAFS(vp), 0); /* decrs ref counts */
AFS_GUNLOCK();
-#ifndef AFS_FBSD80_ENV
- MA_VOP_UNLOCK(vp, 0, ap->a_p);
+#ifndef AFS_FBSD60_ENV
+ MA_VOP_UNLOCK(vp, 0, ap->a_td);
#endif
return 0;
}
* XXX Pretend it worked, to prevent panic on shutdown
* Garrett, please fix - Jim Rees
*/
- if (code)
- printf("afs_vop_reclaim: afs_FlushVCache failed code %d\n", code);
-#ifdef AFS_FBSD60_ENV
- else {
- vnode_destroy_vobject(vp);
-#ifndef AFS_FBSD70_ENV
- vfs_hash_remove(vp);
-#endif
- vp->v_data = 0;
+ if (code) {
+ printf("afs_vop_reclaim: afs_FlushVCache failed code %d vnode\n", code);
+ VOP_PRINT(vp);
}
-#endif
+
+ /* basically, it must not fail */
+ vnode_destroy_vobject(vp);
+ vp->v_data = 0;
+
return 0;
}
{
int error;
AFS_GLOCK();
- error = afs_ustrategy(ap->a_bp, osi_cred());
+ error = afs_ustrategy(ap->a_bp, osi_curcred());
AFS_GUNLOCK();
return error;
}
{
register struct vnode *vp = ap->a_vp;
register struct vcache *vc = VTOAFS(ap->a_vp);
- int s = vc->states;
+ int s = vc->f.states;
-#ifdef AFS_FBSD50_ENV
- printf("tag %s, fid: %d.%x.%x.%x, opens %d, writers %d", vp->v_tag,
- (int)vc->fid.Cell, (u_int) vc->fid.Fid.Volume,
- (u_int) vc->fid.Fid.Vnode, (u_int) vc->fid.Fid.Unique, vc->opens,
+ printf("tag %s, fid: %d.%d.%d.%d, opens %d, writers %d", vp->v_tag,
+ (int)vc->f.fid.Cell, (u_int) vc->f.fid.Fid.Volume,
+ (u_int) vc->f.fid.Fid.Vnode, (u_int) vc->f.fid.Fid.Unique, vc->opens,
vc->execsOrWriters);
-#else
- printf("tag %d, fid: %ld.%x.%x.%x, opens %d, writers %d", vp->v_tag,
- vc->fid.Cell, (u_int) vc->fid.Fid.Volume,
- (u_int) vc->fid.Fid.Vnode, (u_int) vc->fid.Fid.Unique, vc->opens,
- vc->execsOrWriters);
-#endif
printf("\n states%s%s%s%s%s", (s & CStatd) ? " statd" : "",
(s & CRO) ? " readonly" : "", (s & CDirty) ? " dirty" : "",
(s & CMAPPED) ? " mapped" : "",