Module Name: src
Committed By: bouyer
Date: Sat Nov 28 15:56:08 UTC 2009
Modified Files:
src/sys/fs/puffs [netbsd-5]: puffs_vnops.c
Log Message:
Pull up following revision(s) (requested by pooka in ticket #1153):
sys/fs/puffs/puffs_vnops.c: revision 1.139
Send VOP_ABORTOP() as a FAF -- we don't care about the return value.
To generate a diff of this commit:
cvs rdiff -u -r1.129.4.3 -r1.129.4.4 src/sys/fs/puffs/puffs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.129.4.3 src/sys/fs/puffs/puffs_vnops.c:1.129.4.4
--- src/sys/fs/puffs/puffs_vnops.c:1.129.4.3 Sun Oct 18 12:46:07 2009
+++ src/sys/fs/puffs/puffs_vnops.c Sat Nov 28 15:56:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vnops.c,v 1.129.4.3 2009/10/18 12:46:07 sborrill Exp $ */
+/* $NetBSD: puffs_vnops.c,v 1.129.4.4 2009/11/28 15:56:08 bouyer Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.129.4.3 2009/10/18 12:46:07 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.129.4.4 2009/11/28 15:56:08 bouyer Exp $");
#include <sys/param.h>
#include <sys/fstrans.h>
@@ -2126,16 +2126,16 @@
struct vnode *dvp = ap->a_dvp;
struct puffs_mount *pmp = MPTOPUFFSMP(dvp->v_mount);
struct componentname *cnp = ap->a_cnp;
- int error;
if (EXISTSOP(pmp, ABORTOP)) {
PUFFS_MSG_ALLOC(vn, abortop);
puffs_makecn(&abortop_msg->pvnr_cn, &abortop_msg->pvnr_cn_cred,
cnp, PUFFS_USE_FULLPNBUF(pmp));
+ puffs_msg_setfaf(park_abortop);
puffs_msg_setinfo(park_abortop, PUFFSOP_VN,
PUFFS_VN_ABORTOP, VPTOPNC(dvp));
- PUFFS_MSG_ENQUEUEWAIT(pmp, park_abortop, error);
+ puffs_msg_enqueue(pmp, park_abortop);
PUFFS_MSG_RELEASE(abortop);
}
