From owner-dev-commits-src-all@freebsd.org Sun Jan 17 05:10:45 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EE1F64DBB1C; Sun, 17 Jan 2021 05:10:44 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DJNKb59zVz3wL1; Sun, 17 Jan 2021 05:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2E16C1BDA2; Sun, 17 Jan 2021 05:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10H5AgnE046158; Sun, 17 Jan 2021 05:10:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10H5Agk0046157; Sun, 17 Jan 2021 05:10:42 GMT (envelope-from git) Date: Sun, 17 Jan 2021 05:10:42 GMT Message-Id: <202101170510.10H5Agk0046157@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 208ebc381f51 - stable/12 - tmpfs_free_tmp(): explicitly assert that tmp is locked MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 208ebc381f51f80a39489e3a1b5fa4e704ac9359 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jan 2021 05:10:45 -0000 The branch stable/12 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=208ebc381f51f80a39489e3a1b5fa4e704ac9359 commit 208ebc381f51f80a39489e3a1b5fa4e704ac9359 Author: Konstantin Belousov AuthorDate: 2021-01-05 18:53:45 +0000 Commit: Konstantin Belousov CommitDate: 2021-01-17 04:45:24 +0000 tmpfs_free_tmp(): explicitly assert that tmp is locked (cherry picked from commit 9f200bc47b5d8445d91d51f6dfd6af0f1fbbe354) --- sys/fs/tmpfs/tmpfs_vfsops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/fs/tmpfs/tmpfs_vfsops.c b/sys/fs/tmpfs/tmpfs_vfsops.c index 942d2d499b26..c9c211dca002 100644 --- a/sys/fs/tmpfs/tmpfs_vfsops.c +++ b/sys/fs/tmpfs/tmpfs_vfsops.c @@ -529,8 +529,9 @@ tmpfs_unmount(struct mount *mp, int mntflags) void tmpfs_free_tmp(struct tmpfs_mount *tmp) { - + TMPFS_MP_ASSERT_LOCKED(tmp); MPASS(tmp->tm_refcount > 0); + tmp->tm_refcount--; if (tmp->tm_refcount > 0) { TMPFS_UNLOCK(tmp);