Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 26 Mar 2019 01:28:11 +0000 (UTC)
From:      Maxim Sobolev <sobomax@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r345514 - head/sys/fs/tmpfs
Message-ID:  <201903260128.x2Q1SB1Y045843@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: sobomax
Date: Tue Mar 26 01:28:10 2019
New Revision: 345514
URL: https://svnweb.freebsd.org/changeset/base/345514

Log:
  Refine r345425: get rid of superfluous helper macro that I have added.
  
  MFC after:	2 weeks

Modified:
  head/sys/fs/tmpfs/tmpfs_vfsops.c

Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_vfsops.c	Mon Mar 25 21:38:58 2019	(r345513)
+++ head/sys/fs/tmpfs/tmpfs_vfsops.c	Tue Mar 26 01:28:10 2019	(r345514)
@@ -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);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903260128.x2Q1SB1Y045843>