CVS commit: [yamt-nfs-mp] src/sys/nfs

[YAMAMOTO Takashi]

Module Name:    src
Committed By:   yamt
Date:           Wed Jun 24 14:15:35 UTC 2009

Modified Files:
        src/sys/nfs [yamt-nfs-mp]: nfs_vfsops.c

Log Message:
nfs_mount: re-enable MNT_UPDATE.  it's broken as it is in trunk.


To generate a diff of this commit:
cvs rdiff -u -r1.196.10.3 -r1.196.10.4 src/sys/nfs/nfs_vfsops.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/nfs/nfs_vfsops.c
diff -u src/sys/nfs/nfs_vfsops.c:1.196.10.3 src/sys/nfs/nfs_vfsops.c:1.196.10.4
--- src/sys/nfs/nfs_vfsops.c:1.196.10.3	Mon May  4 08:14:22 2009
+++ src/sys/nfs/nfs_vfsops.c	Wed Jun 24 14:15:35 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_vfsops.c,v 1.196.10.3 2009/05/04 08:14:22 yamt Exp $	*/
+/*	$NetBSD: nfs_vfsops.c,v 1.196.10.4 2009/06/24 14:15:35 yamt Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1995
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.196.10.3 2009/05/04 08:14:22 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.196.10.4 2009/06/24 14:15:35 yamt Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_nfs.h"
@@ -643,19 +643,17 @@
 		return (EPROGMISMATCH);
 #endif
 	if (mp->mnt_flag & MNT_UPDATE) {
-#if 0
 		if (nmp == NULL)
 			return (EIO);
 		/*
 		 * When doing an update, we can't change from or to
 		 * v3, or change cookie translation
 		 */
-		args->flags = (args->flags & ~(NFSMNT_NFSV3|NFSMNT_XLATECOOKIE)) |
+		args->flags =
+		    (args->flags & ~(NFSMNT_NFSV3|NFSMNT_XLATECOOKIE)) |
 		    (nmp->nm_flag & (NFSMNT_NFSV3|NFSMNT_XLATECOOKIE));
 		nfs_decode_args(nmp, args, l);
 		return (0);
-#endif
-		return EOPNOTSUPP;
 	}
 	if (args->fhsize < 0 || args->fhsize > NFSX_V3FHMAX)
 		return (EINVAL);