From owner-dev-commits-src-all@freebsd.org Mon Jun 7 00:40:19 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 CA93C6430C9; Mon, 7 Jun 2021 00:40:19 +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 4FyvfW2KTVz4r6M; Mon, 7 Jun 2021 00:40:19 +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 F3B8E5370; Mon, 7 Jun 2021 00:40:18 +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 1570eIc2065875; Mon, 7 Jun 2021 00:40:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1570eI1Y065869; Mon, 7 Jun 2021 00:40:18 GMT (envelope-from git) Date: Mon, 7 Jun 2021 00:40:18 GMT Message-Id: <202106070040.1570eI1Y065869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 32e5616359e5 - stable/13 - tmpfs: drop a redundant NULL check in tmpfs_alloc_vp MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 32e5616359e5e7551e7a97ec54ee110d4af7e250 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: Mon, 07 Jun 2021 00:40:20 -0000 The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=32e5616359e5e7551e7a97ec54ee110d4af7e250 commit 32e5616359e5e7551e7a97ec54ee110d4af7e250 Author: Mateusz Guzik AuthorDate: 2021-05-29 01:10:53 +0000 Commit: Mateusz Guzik CommitDate: 2021-06-07 00:34:58 +0000 tmpfs: drop a redundant NULL check in tmpfs_alloc_vp (cherry picked from commit 439d942b9e7ab4df2bb7a628602069d31788df17) --- sys/fs/tmpfs/tmpfs_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index df5bc12047be..322641b5b853 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -831,7 +831,7 @@ loop: * Make sure the vnode is still there after * getting the interlock to avoid racing a free. */ - if (node->tn_vnode == NULL || node->tn_vnode != vp) { + if (node->tn_vnode != vp) { vput(vp); TMPFS_NODE_LOCK(node); goto loop;