Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 17 Jan 2021 05:10:40 GMT
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 77ac245e9e32 - stable/12 - tmpfs_reclaim: style
Message-ID:  <202101170510.10H5Ae6l046135@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=77ac245e9e3245b88623dc853975a37a3e7d0369

commit 77ac245e9e3245b88623dc853975a37a3e7d0369
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2021-01-13 06:55:38 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
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



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