#include <afsconfig.h>
#include "afs/param.h"
-#ifdef AFS_FBSD70_ENV
#include <sys/param.h>
#include <sys/vnode.h>
- void
- vgonel(struct vnode *vp, struct thread *td);
-#endif
#include "afs/sysincludes.h" /* Standard vendor system headers */
#if defined(AFS_FBSD80_ENV)
#define lock_vnode(v) vn_lock((v), LK_EXCLUSIVE | LK_RETRY)
+#define ilock_vnode(v) vn_lock((v), LK_INTERLOCK|LK_EXCLUSIVE|LK_RETRY);
#define unlock_vnode(v) VOP_UNLOCK((v), 0)
-#elif defined(AFS_FBSD50_ENV)
+#else
#define lock_vnode(v) vn_lock((v), LK_EXCLUSIVE | LK_RETRY, curthread)
+#define ilock_vnode(v) vn_lock((v), LK_INTERLOCK|LK_EXCLUSIVE|LK_RETRY, curthread);
#define unlock_vnode(v) VOP_UNLOCK((v), 0, curthread)
-#else
-#define lock_vnode(v) vn_lock((v), LK_EXCLUSIVE | LK_RETRY, curproc)
-#define unlock_vnode(v) VOP_UNLOCK((v), 0, curproc)
-/* need splvm() protection? */
-#define VM_OBJECT_LOCK(o)
-#define VM_OBJECT_UNLOCK(o)
#endif
/* Try to discard pages, in order to recycle a vcache entry.
* is not dropped and re-acquired for any platform. It may be that *slept is
* therefore obsolescent.
*
- * OSF/1 Locking: VN_LOCK has been called.
- * XXX - should FreeBSD have done this, too? Certainly looks like it.
- * Maybe better to just call vnode_pager_setsize()?
*/
int
osi_VM_FlushVCache(struct vcache *avc, int *slept)
{
struct vm_object *obj;
- struct vnode *vp;
- if (VREFCOUNT(avc) > 1)
+ struct vnode *vp = AFSTOV(avc);
+
+ if (!VI_TRYLOCK(vp)) /* need interlock to check usecount */
return EBUSY;
- if (avc->opens)
+ if (vp->v_usecount > 0) {
+ VI_UNLOCK(vp);
return EBUSY;
+ }
+
+ /* XXX
+ * The value of avc->opens here came to be, at some point,
+ * typically -1. This was caused by incorrectly performing afs_close
+ * processing on vnodes being recycled */
+ if (avc->opens) {
+ VI_UNLOCK(vp);
+ return EBUSY;
+ }
/* if a lock is held, give up */
- if (CheckLock(&avc->lock))
+ if (CheckLock(&avc->lock)) {
+ VI_UNLOCK(vp);
return EBUSY;
+ }
- return(0);
+ if ((vp->v_iflag & VI_DOOMED) != 0) {
+ VI_UNLOCK(vp);
+ return (0);
+ }
+ /* must hold the vnode before calling vgone()
+ * This code largely copied from vfs_subr.c:vlrureclaim() */
+ vholdl(vp);
AFS_GUNLOCK();
- vp = AFSTOV(avc);
-#ifndef AFS_FBSD70_ENV
- lock_vnode(vp);
-#endif
- if (VOP_GETVOBJECT(vp, &obj) == 0) {
- VM_OBJECT_LOCK(obj);
- vm_object_page_remove(obj, 0, 0, FALSE);
-#if 1
- if (obj->ref_count == 0) {
- simple_lock(&vp->v_interlock);
- vgonel(vp, curthread);
- vp->v_tag = VT_AFS;
- SetAfsVnode(vp);
- }
-#endif
- VM_OBJECT_UNLOCK(obj);
- }
-#ifndef AFS_FBSD70_ENV
+ *slept = 1;
+ /* use the interlock while locking, so no one else can DOOM this */
+ ilock_vnode(vp);
+ vgone(vp);
unlock_vnode(vp);
-#endif
- AFS_GLOCK();
+ vdrop(vp);
+ AFS_GLOCK();
return 0;
}
*/
do {
anyio = 0;
-#ifdef AFS_FBSD80_ENV
- lock_vnode(vp);
-#endif
if (VOP_GETVOBJECT(vp, &obj) == 0 && (obj->flags & OBJ_MIGHTBEDIRTY)) {
-#ifdef AFS_FBSD80_ENV
- unlock_vnode(vp);
-#endif
-#ifdef AFS_FBSD50_ENV
if (!vget(vp, LK_EXCLUSIVE | LK_RETRY, curthread)) {
-#else
- if (!vget(vp, LK_EXCLUSIVE | LK_RETRY | LK_NOOBJ, curproc)) {
-#endif
if (VOP_GETVOBJECT(vp, &obj) == 0) {
VM_OBJECT_LOCK(obj);
vm_object_page_clean(obj, 0, 0, OBJPC_SYNC);
vput(vp);
}
}
-#ifdef AFS_FBSD80_ENV
- else
- unlock_vnode(vp);
-#endif
} while (anyio && (--tries > 0));
AFS_GLOCK();
ObtainWriteLock(&avc->lock, 94);
* be some pages around when we return, newly created by concurrent activity.
*/
void
-osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync)
+osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred, int sync)
{
struct vnode *vp;
- struct vm_object *obj;
- int anyio, tries, code;
+ int tries, code;
+ int islocked;
SPLVAR;
vp = AFSTOV(avc);
+ VI_LOCK(vp);
if (vp->v_iflag & VI_DOOMED) {
- USERPRI;
- return 0;
+ VI_UNLOCK(vp);
+ USERPRI;
+ return;
}
+ VI_UNLOCK(vp);
+
+ islocked = VOP_ISLOCKED(vp);
+ if (islocked == LK_EXCLOTHER)
+ panic("Trying to Smush over someone else's lock");
+ else if (islocked == LK_SHARED) {
+ afs_warn("Trying to Smush with a shared lock");
+ vn_lock(vp, LK_UPGRADE);
+ } else if (!islocked)
+ vn_lock(vp, LK_EXCLUSIVE);
if (vp->v_bufobj.bo_object != NULL) {
- VM_OBJECT_LOCK(vp->v_bufobj.bo_object);
- /*
- * Do we really want OBJPC_SYNC? OBJPC_INVAL would be
- * faster, if invalidation is really what we are being
- * asked to do. (It would make more sense, too, since
- * otherwise this function is practically identical to
- * osi_VM_StoreAllSegments().) -GAW
- */
+ VM_OBJECT_LOCK(vp->v_bufobj.bo_object);
+ /*
+ * Do we really want OBJPC_SYNC? OBJPC_INVAL would be
+ * faster, if invalidation is really what we are being
+ * asked to do. (It would make more sense, too, since
+ * otherwise this function is practically identical to
+ * osi_VM_StoreAllSegments().) -GAW
+ */
- /*
- * Dunno. We no longer resemble osi_VM_StoreAllSegments,
- * though maybe that's wrong, now. And OBJPC_SYNC is the
- * common thing in 70 file systems, it seems. Matt.
- */
+ /*
+ * Dunno. We no longer resemble osi_VM_StoreAllSegments,
+ * though maybe that's wrong, now. And OBJPC_SYNC is the
+ * common thing in 70 file systems, it seems. Matt.
+ */
- vm_object_page_clean(vp->v_bufobj.bo_object, 0, 0, OBJPC_SYNC);
- VM_OBJECT_UNLOCK(vp->v_bufobj.bo_object);
+ vm_object_page_clean(vp->v_bufobj.bo_object, 0, 0, OBJPC_SYNC);
+ VM_OBJECT_UNLOCK(vp->v_bufobj.bo_object);
}
tries = 5;
- code = vinvalbuf(vp, V_SAVE, curthread, PCATCH, 0);
+ code = osi_vinvalbuf(vp, V_SAVE, PCATCH, 0);
while (code && (tries > 0)) {
- code = vinvalbuf(vp, V_SAVE, curthread, PCATCH, 0);
- --tries;
+ afs_warn("TryToSmush retrying vinvalbuf");
+ code = osi_vinvalbuf(vp, V_SAVE, PCATCH, 0);
+ --tries;
}
+ if (islocked == LK_SHARED)
+ vn_lock(vp, LK_DOWNGRADE);
+ else if (!islocked)
+ VOP_UNLOCK(vp, 0);
USERPRI;
}
* Locking: No lock is held, not even the global lock.
*/
void
-osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp)
+osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp)
{
struct vnode *vp;
struct vm_object *obj;
vm_object_page_remove(obj, 0, 0, FALSE);
VM_OBJECT_UNLOCK(obj);
}
- /*vinvalbuf(AFSTOV(avc),0, NOCRED, curproc, 0,0); */
+ osi_vinvalbuf(vp, 0, 0, 0);
}
/* Purge pages beyond end-of-file, when truncating a file.
* it only works on Solaris.
*/
void
-osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred)
+osi_VM_Truncate(struct vcache *avc, int alen, afs_ucred_t *acred)
{
vnode_pager_setsize(AFSTOV(avc), alen);
}
git://git.openafs.org / openafs.git / blobdiff