 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_syscalls.c,v 1.413 2011/01/02 05:12:33 dholland Exp $	*/
+/*	$NetBSD: vfs_syscalls.c,v 1.414 2011/01/13 07:25:50 pooka Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -56,27 +56,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)vfs_syscalls.c	8.42 (Berkeley) 7/31/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.413 2011/01/02 05:12:33 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.414 2011/01/13 07:25:50 pooka Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_fileassoc.h"
 #include "veriexec.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 @@ -159,27 +159,28 @@ mount_update(struct lwp *l, struct vnode
 	/* We can operate only on VV_ROOT nodes. */
 	if ((vp->v_vflag & VV_ROOT) == 0) {
 		error = EINVAL;
 		goto out;
+	}
 	/*
 	 * We only allow the filesystem to be reloaded if it
 	 * is currently mounted read-only.  Additionally, we
 	 * prevent read-write to read-only downgrades.
 	 */
 	if ((flags & (MNT_RELOAD | MNT_RDONLY)) != 0 &&
-	    (mp->mnt_flag & MNT_RDONLY) == 0) {
+	    (mp->mnt_flag & MNT_RDONLY) == 0 &&
 	    (mp->mnt_iflag & IMNT_CAN_RWTORO) == 0) {
 		error = EOPNOTSUPP;	/* Needs translation */
 		goto out;
+	}
 	error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_MOUNT,
 	    KAUTH_REQ_SYSTEM_MOUNT_UPDATE, mp, KAUTH_ARG(flags), data);
 	if (error)
 		goto out;
 	if (vfs_busy(mp, NULL)) {
 		error = EPERM;
 		goto out;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fstypes.h,v 1.27 2011/01/13 07:23:39 pooka Exp $	*/
+/*	$NetBSD: fstypes.h,v 1.28 2011/01/13 07:25:50 pooka Exp $	*/
 /*
  * Copyright (c) 1989, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -200,26 +200,27 @@ typedef struct fhandle	fhandle_t;
  * Internal filesystem control flags.
  * These are set in struct mount mnt_iflag.
+ *
  * IMNT_UNMOUNT locks the mount entry so that name lookup cannot proceed
  * past the mount point.  This keeps the subtree stable during mounts
  * and unmounts.
  */
 #define	IMNT_GONE	0x00000001	/* filesystem is gone.. */
 #define	IMNT_UNMOUNT	0x00000002	/* unmount in progress */
 #define	IMNT_WANTRDWR	0x00000004	/* upgrade to read/write requested */
 #define	IMNT_DTYPE	0x00000040	/* returns d_type fields */
 #define	IMNT_HAS_TRANS	0x00000080	/* supports transactions */
 #define	IMNT_MPSAFE	0x00000100	/* file system code MP safe */
 #define	IMNT_CAN_RWTORO	0x00000200	/* can downgrade fs to from rw to r/o */
 #define	__MNT_FLAGS \
 	__MNT_BASIC_FLAGS \
 	__MNT_EXPORTED_FLAGS \
 	__MNT_INTERNAL_FLAGS \
 	__MNT_EXTERNAL_FLAGS
 #define	__MNT_FLAG_BITS \
 	"\20" \
 	"\40MNT_SOFTDEP" \
 	"\37MNT_NODEVMTIME" \
 	"\36MNT_SYMPERM" \
 	"\35MNT_EXPUBLIC" \
 @@ -244,26 +245,27 @@ typedef struct fhandle	fhandle_t;
 	"\12MNT_DEFEXPORTED" \
 	"\11MNT_EXPORTED" \
 	"\10MNT_EXRDONLY" \
 	"\07MNT_ASYNC" \
 	"\06MNT_UNION" \
 	"\05MNT_NODEV" \
 	"\04MNT_NOSUID" \
 	"\03MNT_NOEXEC" \
 	"\02MNT_SYNCHRONOUS" \
 	"\01MNT_RDONLY"
 #define	__IMNT_FLAG_BITS \
 	"\20" \
 	"\12IMNT_CAN_RWTORO" \
         "\11IMNT_MPSAFE" \
 	"\10IMNT_HAS_TRANS" \
 	"\07IMNT_DTYPE" \
 	"\03IMNT_WANTRDWR" \
 	"\02IMNT_UNMOUNT" \
 	"\01IMNT_GONE"
 /*
  * Flags for various system call interfaces.
+ *
  * waitfor flags to vfs_sync() and getvfsstat()
  */
 #define	MNT_WAIT	1	/* synchronously wait for I/O to complete */