 @@ -1,14 +1,14 @@
-/*	$NetBSD: tmpfs.h,v 1.52 2015/07/06 10:07:12 hannken Exp $	*/
+/*	$NetBSD: tmpfs.h,v 1.53 2017/01/27 10:47:54 hannken Exp $	*/
 /*
  * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal, developed as part of Google's Summer of Code
  * 2005 program.
+ *
  * 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
 @@ -207,26 +207,29 @@ CTASSERT(TMPFS_MAXNAMLEN < UINT16_MAX);
  * Ored into tmpfs_node_t::tn_holdcount.
  */
 #define TMPFS_NODE_RECLAIMED		(1U << 30)
 /*
  * Internal representation of a tmpfs mount point.
  */
 typedef struct tmpfs_mount {
 	/* Limit and number of bytes in use by the file system. */
 	uint64_t		tm_mem_limit;
 	uint64_t		tm_bytes_used;
 	kmutex_t		tm_acc_lock;
 	/* Read-only indicator. */
 	bool			tm_rdonly;
 	/* Pointer to the root inode. */
 	tmpfs_node_t *		tm_root;
 	/* Maximum number of possible nodes for this file system. */
 	unsigned int		tm_nodes_max;
 	/* Number of nodes currently allocated. */
 	unsigned int		tm_nodes_cnt;
 	/* List of inodes and the lock protecting it. */
 	kmutex_t		tm_lock;
 	struct tmpfs_node_list	tm_nodes;
 } tmpfs_mount_t;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tmpfs_vfsops.c,v 1.68 2016/08/26 21:44:24 dholland Exp $	*/
+/*	$NetBSD: tmpfs_vfsops.c,v 1.69 2017/01/27 10:47:54 hannken Exp $	*/
 /*
  * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal, developed as part of Google's Summer of Code
  * 2005 program.
+ *
  * 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
 @@ -32,27 +32,27 @@
 /*
  * Efficient memory file system.
+ *
  * tmpfs is a file system that uses NetBSD's virtual memory sub-system
  * (the well-known UVM) to store file data and metadata in an efficient
  * way.  This means that it does not follow the structure of an on-disk
  * file system because it simply does not need to.  Instead, it uses
  * memory-specific data structures and algorithms to automatically
  * allocate and release resources.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vfsops.c,v 1.68 2016/08/26 21:44:24 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vfsops.c,v 1.69 2017/01/27 10:47:54 hannken Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/types.h>
 #include <sys/kmem.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
 #include <sys/kauth.h>
 #include <sys/module.h>
 #include <miscfs/genfs/genfs.h>
 @@ -82,27 +82,27 @@ tmpfs_done(void)
 	pool_destroy(&tmpfs_node_pool);
+}
 int
 tmpfs_mount(struct mount *mp, const char *path, void *data, size_t *data_len)
+{
 	struct tmpfs_args *args = data;
 	tmpfs_mount_t *tmp;
 	tmpfs_node_t *root;
 	struct vattr va;
 	struct vnode *vp;
 	uint64_t memlimit;
 	ino_t nodes;
-	int error;
+	int error, flags;
 	bool set_memlimit;
 	bool set_nodes;
 	if (args == NULL)
 		return EINVAL;
 	/* Validate the version. */
 	if (*data_len < sizeof(*args) ||
 	    args->ta_version != TMPFS_ARGS_VERSION)
 		return EINVAL;
 	/* Handle retrieval of mount point arguments. */
 	if (mp->mnt_flag & MNT_GETARGS) {
 @@ -150,44 +150,60 @@ tmpfs_mount(struct mount *mp, const char
 		nodes = 3 + (memlimit / 1024);
 		set_nodes = false;
 	} else {
 		nodes = args->ta_nodes_max;
 		set_nodes = true;
+	}
 	nodes = MIN(nodes, INT_MAX);
 	KASSERT(nodes >= 3);
 	if (mp->mnt_flag & MNT_UPDATE) {
 		tmp = VFS_TO_TMPFS(mp);
 		if (set_nodes && nodes < tmp->tm_nodes_cnt)
 			return EBUSY;
 		if (!tmp->tm_rdonly && (mp->mnt_flag & MNT_RDONLY)) {
 			/* Changing from read/write to read-only. */
 			flags = WRITECLOSE;
 			if ((mp->mnt_flag & MNT_FORCE))
 				flags |= FORCECLOSE;
 			error = vflush(mp, NULL, flags);
 			if (error)
 				return error;
 			tmp->tm_rdonly = true;
+		}
 		if (tmp->tm_rdonly && (mp->mnt_flag & IMNT_WANTRDWR)) {
 			/* Changing from read-only to read/write. */
 			tmp->tm_rdonly = false;
+		}
 		if (set_memlimit) {
 			if ((error = tmpfs_mntmem_set(tmp, memlimit)) != 0)
 				return error;
+		}
 		if (set_nodes)
 			tmp->tm_nodes_max = nodes;
 		root = tmp->tm_root;
 		root->tn_uid = args->ta_root_uid;
 		root->tn_gid = args->ta_root_gid;
 		root->tn_mode = args->ta_root_mode;
 		return 0;
+	}
 	/* Allocate the tmpfs mount structure and fill it. */
 	tmp = kmem_zalloc(sizeof(tmpfs_mount_t), KM_SLEEP);
 	if (tmp == NULL)
 		return ENOMEM;
 	if ((mp->mnt_flag & MNT_RDONLY))
 		tmp->tm_rdonly = true;
 	tmp->tm_nodes_max = nodes;
 	tmp->tm_nodes_cnt = 0;
 	LIST_INIT(&tmp->tm_nodes);
 	mutex_init(&tmp->tm_lock, MUTEX_DEFAULT, IPL_NONE);
 	tmpfs_mntmem_init(tmp, memlimit);
 	mp->mnt_data = tmp;
 	/* Allocate the root node. */
 	vattr_null(&va);
 	va.va_type = VDIR;
 	va.va_mode = args->ta_root_mode & ALLPERMS;
 	va.va_uid = args->ta_root_uid;