Module Name: src
Committed By: tkusumi
Date: Sat Nov 23 17:13:46 UTC 2019
Modified Files:
src/sys/fs/autofs: autofs.h autofs_vnops.c
Log Message:
autofs: Remove unused autofs_node::an_vnode_lock
Unlike FreeBSD and DragonFlyBSD, this is unused in NetBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/autofs/autofs.h
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/autofs/autofs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/autofs/autofs.h
diff -u src/sys/fs/autofs/autofs.h:1.3 src/sys/fs/autofs/autofs.h:1.4
--- src/sys/fs/autofs/autofs.h:1.3 Sat Nov 23 08:00:59 2019
+++ src/sys/fs/autofs/autofs.h Sat Nov 23 17:13:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: autofs.h,v 1.3 2019/11/23 08:00:59 tkusumi Exp $ */
+/* $NetBSD: autofs.h,v 1.4 2019/11/23 17:13:46 tkusumi Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -111,7 +111,6 @@ struct autofs_node {
autofs_node) an_children;
struct autofs_mount *an_mount;
struct vnode *an_vnode;
- kmutex_t an_vnode_lock;
bool an_cached;
bool an_wildcards;
struct callout an_callout;
Index: src/sys/fs/autofs/autofs_vnops.c
diff -u src/sys/fs/autofs/autofs_vnops.c:1.2 src/sys/fs/autofs/autofs_vnops.c:1.3
--- src/sys/fs/autofs/autofs_vnops.c:1.2 Sat Nov 23 15:17:46 2019
+++ src/sys/fs/autofs/autofs_vnops.c Sat Nov 23 17:13:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: autofs_vnops.c,v 1.2 2019/11/23 15:17:46 tkusumi Exp $ */
+/* $NetBSD: autofs_vnops.c,v 1.3 2019/11/23 17:13:46 tkusumi Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
* Copyright (c) 2016 The DragonFly Project
@@ -34,7 +34,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autofs_vnops.c,v 1.2 2019/11/23 15:17:46 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autofs_vnops.c,v 1.3 2019/11/23 17:13:46 tkusumi Exp $");
#include "autofs.h"
@@ -578,10 +578,8 @@ autofs_reclaim(void *v)
* We do not free autofs_node here; instead we are
* destroying them in autofs_node_delete().
*/
- mutex_enter(&anp->an_vnode_lock);
anp->an_vnode = NULL;
vp->v_data = NULL;
- mutex_exit(&anp->an_vnode_lock);
return 0;
}
@@ -629,7 +627,6 @@ autofs_node_new(struct autofs_node *pare
anp->an_name = autofs_strndup(name, namelen, KM_SLEEP);
anp->an_ino = amp->am_last_ino++;
callout_init(&anp->an_callout, 0);
- mutex_init(&anp->an_vnode_lock, MUTEX_DEFAULT, IPL_NONE);
getnanotime(&anp->an_ctime);
anp->an_parent = parent;
anp->an_mount = amp;
@@ -681,7 +678,6 @@ autofs_node_delete(struct autofs_node *a
if (anp->an_parent)
RB_REMOVE(autofs_node_tree, &anp->an_parent->an_children, anp);
- mutex_destroy(&anp->an_vnode_lock);
kmem_strfree(anp->an_name);
pool_put(&autofs_node_pool, anp);
}
