summaryrefslogtreecommitdiff
path: root/sys/fs/tmpfs
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2016-03-12 08:51:13 +0000
committerjoerg <joerg@NetBSD.org>2016-03-12 08:51:13 +0000
commit788bd8fd1fed7c3d99cabb7e2ea7471cdfd9f943 (patch)
treec0d9340577f3545dc6c5461240d0fb7ae8cafef8 /sys/fs/tmpfs
parent28f9534668be20eff11992f0752de0b7970d9b36 (diff)
Implement most of mount -ur functionality for tmpfs. Remaining issue is
the question who is responsible for syncing pending writes, but the functionality is good enough for serving as read-only chroot base in bulk builds.
Diffstat (limited to 'sys/fs/tmpfs')
-rw-r--r--sys/fs/tmpfs/tmpfs_vfsops.c6
-rw-r--r--sys/fs/tmpfs/tmpfs_vnops.c14
2 files changed, 15 insertions, 5 deletions
diff --git a/sys/fs/tmpfs/tmpfs_vfsops.c b/sys/fs/tmpfs/tmpfs_vfsops.c
index 61bc6fd0816..ab09700bd17 100644
--- a/sys/fs/tmpfs/tmpfs_vfsops.c
+++ b/sys/fs/tmpfs/tmpfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vfsops.c,v 1.66 2016/03/12 08:45:23 joerg Exp $ */
+/* $NetBSD: tmpfs_vfsops.c,v 1.67 2016/03/12 08:51:13 joerg Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vfsops.c,v 1.66 2016/03/12 08:45:23 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vfsops.c,v 1.67 2016/03/12 08:51:13 joerg Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -210,7 +210,7 @@ tmpfs_mount(struct mount *mp, const char *path, void *data, size_t *data_len)
mp->mnt_stat.f_namemax = TMPFS_MAXNAMLEN;
mp->mnt_fs_bshift = PAGE_SHIFT;
mp->mnt_dev_bshift = DEV_BSHIFT;
- mp->mnt_iflag |= IMNT_MPSAFE;
+ mp->mnt_iflag |= IMNT_MPSAFE | IMNT_CAN_RWTORO;
vfs_getnewfsid(mp);
error = set_statvfs_info(path, UIO_USERSPACE, "tmpfs", UIO_SYSSPACE,
diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c
index 9e85d290416..17101de670b 100644
--- a/sys/fs/tmpfs/tmpfs_vnops.c
+++ b/sys/fs/tmpfs/tmpfs_vnops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vnops.c,v 1.123 2015/07/06 10:07:12 hannken Exp $ */
+/* $NetBSD: tmpfs_vnops.c,v 1.124 2016/03/12 08:51:13 joerg Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.123 2015/07/06 10:07:12 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.124 2016/03/12 08:51:13 joerg Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -572,6 +572,11 @@ tmpfs_write(void *v)
KASSERT(VOP_ISLOCKED(vp));
+ if ((vp->v_mount->mnt_flag & MNT_RDONLY) != 0) {
+ error = EROFS;
+ goto out;
+ }
+
node = VP_TO_TMPFS_NODE(vp);
oldsize = node->tn_size;
@@ -1242,6 +1247,11 @@ tmpfs_putpages(void *v)
return 0;
}
+ if ((vp->v_mount->mnt_flag & MNT_RDONLY) != 0) {
+ mutex_exit(vp->v_interlock);
+ return EROFS;
+ }
+
node = VP_TO_TMPFS_NODE(vp);
uobj = node->tn_spec.tn_reg.tn_aobj;