Skip to content

Commit d17921a

Browse files
committed
Fixed recursive lock in vcache
1 parent f82a87c commit d17921a

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

sys/kern/vfs_vcache.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ vnode_t *vcache_hashget(mount_t *mp, ino_t ino) {
5353

5454
vnode_t *vn = NULL;
5555
TAILQ_FOREACH (vn, &vcache_buckets[bucket], v_cached) {
56-
if (vn->v_mount == mp && vn->v_ino == ino) {
56+
if ((vn->v_mount == mp ) && (vn->v_ino == ino)) {
5757
TAILQ_REMOVE(&vcache_free, vn, v_free);
5858
TAILQ_REMOVE(&vcache_buckets[bucket], vn, v_cached);
5959
vnode_hold(vn);
@@ -70,8 +70,6 @@ static int vfs_vcache_remove_from_bucket(vnode_t *vn) {
7070
vcache_t bucket = vcache_hash(vn->v_mount, vn->v_ino);
7171
vnode_t *bucket_node = NULL;
7272

73-
SCOPED_MTX_LOCK(&vcache_giant_lock);
74-
7573
TAILQ_FOREACH (bucket_node, &vcache_buckets[bucket], v_cached) {
7674
if (bucket_node == vn) {
7775
TAILQ_REMOVE(&vcache_buckets[bucket], vn, v_cached);

0 commit comments

Comments
 (0)