diff options
| -rw-r--r-- | share/man/man9/VOP_LOOKUP.9 | 6 | ||||
| -rw-r--r-- | sys/nfs/nfs.h | 10 | ||||
| -rw-r--r-- | sys/nfs/nfs_serv.c | 13 |
3 files changed, 6 insertions, 23 deletions
diff --git a/share/man/man9/VOP_LOOKUP.9 b/share/man/man9/VOP_LOOKUP.9 index 3a4c23533c1..af1a8d2c730 100644 --- a/share/man/man9/VOP_LOOKUP.9 +++ b/share/man/man9/VOP_LOOKUP.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: VOP_LOOKUP.9,v 1.20 2007/05/31 19:20:00 jmc Exp $ +.\" $OpenBSD: VOP_LOOKUP.9,v 1.21 2009/05/21 12:24:22 thib Exp $ .\" .\" Copyright (c) 2003 Ted Unangst .\" All rights reserved. @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: May 21 2009 $ .Dt VOP_LOOKUP 9 .Os .Sh NAME @@ -834,8 +834,6 @@ may contain the following flags: .Bl -tag -width IO_APPEND -offset indent -compact .It Dv IO_APPEND Perform write at the end of file. -.\" .It Dv IO_METASYNC -.\" Ensure all metadata is written synchronously. .It Dv IO_NDELAY Non-blocking I/O. .It Dv IO_SYNC diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h index 33eb2a5605d..cf21dc38787 100644 --- a/sys/nfs/nfs.h +++ b/sys/nfs/nfs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs.h,v 1.38 2009/01/24 23:35:47 thib Exp $ */ +/* $OpenBSD: nfs.h,v 1.39 2009/05/21 12:24:22 thib Exp $ */ /* $NetBSD: nfs.h,v 1.10.4.1 1996/05/27 11:23:56 fvdl Exp $ */ /* @@ -107,14 +107,6 @@ #define B_INVAFTERWRITE B_INVAL /* - * The IO_METASYNC flag should be implemented for local file systems. - * (Until then, it is nothin at all.) - */ -#ifndef IO_METASYNC -#define IO_METASYNC 0 -#endif - -/* * Structures for the nfssvc(2) syscall. Not that anyone but nfsd and mount_nfs * should ever try and use it. */ diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index 843a68e2870..614b6691680 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_serv.c,v 1.66 2009/04/13 17:51:57 blambert Exp $ */ +/* $OpenBSD: nfs_serv.c,v 1.67 2009/05/21 12:24:22 thib Exp $ */ /* $NetBSD: nfs_serv.c,v 1.34 1997/05/12 23:37:12 fvdl Exp $ */ /* @@ -798,19 +798,12 @@ nfsrv_write(nfsd, slp, procp, mrq) mp = mp->m_next; } - /* - * XXX - * The IO_METASYNC flag indicates that all metadata (and not just - * enough to ensure data integrity) mus be written to stable storage - * synchronously. - * (IO_METASYNC is not yet implemented in 4.4BSD-Lite.) - */ if (stable == NFSV3WRITE_UNSTABLE) ioflags = IO_NODELOCKED; else if (stable == NFSV3WRITE_DATASYNC) ioflags = (IO_SYNC | IO_NODELOCKED); else - ioflags = (IO_METASYNC | IO_SYNC | IO_NODELOCKED); + ioflags = (IO_SYNC | IO_NODELOCKED); uiop->uio_resid = len; uiop->uio_rw = UIO_WRITE; uiop->uio_segflg = UIO_SYSSPACE; @@ -1047,7 +1040,7 @@ loop1: else if (nfsd->nd_stable == NFSV3WRITE_DATASYNC) ioflags = (IO_SYNC | IO_NODELOCKED); else - ioflags = (IO_METASYNC | IO_SYNC | IO_NODELOCKED); + ioflags = (IO_SYNC | IO_NODELOCKED); uiop->uio_rw = UIO_WRITE; uiop->uio_segflg = UIO_SYSSPACE; uiop->uio_procp = (struct proc *)0; |