Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check that the filesystem acutally uses WAPBL before initiating a

Browse Source 
transaction for the directio case. Fixes PR 39929 and similiar issues
seen with PostgreSQL.
This commit is contained in:
joerg 2008-12-01 11:22:12 +00:00
parent a371a02d26
commit f5bbefdb21
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/miscfs/genfs/genfs_io.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: genfs_io.c,v 1.15 2008/11/16 19:34:29 pooka Exp $ */ /* $NetBSD: genfs_io.c,v 1.16 2008/12/01 11:22:12 joerg Exp $ */
/* /*
* Copyright (c) 1982, 1986, 1989, 1993 * Copyright (c) 1982, 1986, 1989, 1993
@ -31,7 +31,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.15 2008/11/16 19:34:29 pooka Exp $"); __KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.16 2008/12/01 11:22:12 joerg Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -1560,6 +1560,8 @@ genfs_directio(struct vnode *vp, struct uio *uio, int ioflag)
size_t len; size_t len;
const int mask = DEV_BSIZE - 1; const int mask = DEV_BSIZE - 1;
int error; int error;
bool need_wapbl = (vp->v_mount && vp->v_mount->mnt_wapbl &&
(ioflag & IO_JOURNALLOCKED) == 0);
/* /*
* We only support direct I/O to user space for now. * We only support direct I/O to user space for now.
@ -1581,7 +1583,7 @@ genfs_directio(struct vnode *vp, struct uio *uio, int ioflag)
return; return;
} }
if ((ioflag & IO_JOURNALLOCKED) == 0) { if (need_wapbl) {
error = WAPBL_BEGIN(vp->v_mount); error = WAPBL_BEGIN(vp->v_mount);
if (error) if (error)
return; return;
@ -1633,7 +1635,7 @@ genfs_directio(struct vnode *vp, struct uio *uio, int ioflag)
uio->uio_resid -= len; uio->uio_resid -= len;
} }
if ((ioflag & IO_JOURNALLOCKED) == 0) if (need_wapbl)
WAPBL_END(vp->v_mount); WAPBL_END(vp->v_mount);
} }