d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refine r345425: get rid of superfluous helper macro that I have added.

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Maxim Sobolev 2019-03-26 01:28:10 +00:00
parent fd76e780a7
commit 4f20706113
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=345514
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/fs/tmpfs/tmpfs_vfsops.c
View File

@ -137,8 +137,6 @@ tmpfs_node_fini(void *mem, int size)
mtx_destroy(&node->tn_interlock);
}
#define TMPFS_SC(mp) ((struct tmpfs_mount *)(mp)->mnt_data)
static int
tmpfs_mount(struct mount *mp)
{
@ -174,11 +172,11 @@ tmpfs_mount(struct mount *mp)
* parameter, say trying to change rw to ro or vice
* versa, would cause vfs_filteropt() to bail.
*/
if (size_max != TMPFS_SC(mp)->tm_size_max)
if (size_max != VFS_TO_TMPFS(mp)->tm_size_max)
return (EOPNOTSUPP);
}
if (vfs_flagopt(mp->mnt_optnew, "ro", NULL, 0) &&
!(TMPFS_SC(mp)->tm_ronly)) {
!(VFS_TO_TMPFS(mp)->tm_ronly)) {
/* RW -> RO */
error = VFS_SYNC(mp, MNT_WAIT);
if (error)
@ -189,14 +187,14 @@ tmpfs_mount(struct mount *mp)
error = vflush(mp, 0, flags, curthread);
if (error)
return (error);
TMPFS_SC(mp)->tm_ronly = 1;
VFS_TO_TMPFS(mp)->tm_ronly = 1;
MNT_ILOCK(mp);
mp->mnt_flag |= MNT_RDONLY;
MNT_IUNLOCK(mp);
} else if (!vfs_flagopt(mp->mnt_optnew, "ro", NULL, 0) &&
TMPFS_SC(mp)->tm_ronly) {
VFS_TO_TMPFS(mp)->tm_ronly) {
/* RO -> RW */
TMPFS_SC(mp)->tm_ronly = 0;
VFS_TO_TMPFS(mp)->tm_ronly = 0;
MNT_ILOCK(mp);
mp->mnt_flag &= ~MNT_RDONLY;
MNT_IUNLOCK(mp);