From owner-dev-commits-src-all@freebsd.org Sun Jan 17 05:10:41 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 C08CA4DBAD9; Sun, 17 Jan 2021 05:10:41 +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 4DJNKY37tWz3vxc; Sun, 17 Jan 2021 05:10:41 +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 282C01B9F7; Sun, 17 Jan 2021 05:10:41 +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 10H5AeaW046136; Sun, 17 Jan 2021 05:10:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10H5Ae6l046135; Sun, 17 Jan 2021 05:10:40 GMT (envelope-from git) Date: Sun, 17 Jan 2021 05:10:40 GMT Message-Id: <202101170510.10H5Ae6l046135@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: 77ac245e9e32 - stable/12 - tmpfs_reclaim: style 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: 77ac245e9e3245b88623dc853975a37a3e7d0369 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:42 -0000 The branch stable/12 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=77ac245e9e3245b88623dc853975a37a3e7d0369 commit 77ac245e9e3245b88623dc853975a37a3e7d0369 Author: Konstantin Belousov AuthorDate: 2021-01-13 06:55:38 +0000 Commit: Konstantin Belousov CommitDate: 2021-01-17 04:45:05 +0000 tmpfs_reclaim: style (cherry picked from commit 685265ecfbd8e929d7c6988a99b708d3a3a5cbf4) --- sys/fs/tmpfs/tmpfs_vnops.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index 7a4308445a6a..84134e48e83e 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -1302,11 +1302,11 @@ tmpfs_inactive(struct vop_inactive_args *v) int tmpfs_reclaim(struct vop_reclaim_args *v) { - struct vnode *vp = v->a_vp; - + struct vnode *vp; struct tmpfs_mount *tmp; struct tmpfs_node *node; + vp = v->a_vp; node = VP_TO_TMPFS_NODE(vp); tmp = VFS_TO_TMPFS(vp->v_mount); @@ -1321,9 +1321,11 @@ tmpfs_reclaim(struct vop_reclaim_args *v) TMPFS_NODE_LOCK(node); tmpfs_free_vp(vp); - /* If the node referenced by this vnode was deleted by the user, + /* + * If the node referenced by this vnode was deleted by the user, * we must free its associated data structures (now that the vnode - * is being reclaimed). */ + * is being reclaimed). + */ if (node->tn_links == 0 && (node->tn_vpstate & TMPFS_VNODE_ALLOCATING) == 0) { node->tn_vpstate = TMPFS_VNODE_DOOMED; @@ -1333,7 +1335,7 @@ tmpfs_reclaim(struct vop_reclaim_args *v) TMPFS_NODE_UNLOCK(node); MPASS(vp->v_data == NULL); - return 0; + return (0); } int