From owner-svn-src-head@freebsd.org Tue Mar 26 01:28:12 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1F7151555070; Tue, 26 Mar 2019 01:28:12 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 97F816A299; Tue, 26 Mar 2019 01:28:11 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4551C1846B; Tue, 26 Mar 2019 01:28:11 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2Q1SB6t045844; Tue, 26 Mar 2019 01:28:11 GMT (envelope-from sobomax@FreeBSD.org) Received: (from sobomax@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2Q1SB1Y045843; Tue, 26 Mar 2019 01:28:11 GMT (envelope-from sobomax@FreeBSD.org) Message-Id: <201903260128.x2Q1SB1Y045843@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sobomax set sender to sobomax@FreeBSD.org using -f From: Maxim Sobolev Date: Tue, 26 Mar 2019 01:28:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345514 - head/sys/fs/tmpfs X-SVN-Group: head X-SVN-Commit-Author: sobomax X-SVN-Commit-Paths: head/sys/fs/tmpfs X-SVN-Commit-Revision: 345514 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 97F816A299 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.962,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Mar 2019 01:28:12 -0000 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);