system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 12:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

devfs: retire the unused DEVFS_DEL_VNLOCKED flag

Browse source
This commit is contained in:
Mateusz Guzik 2022-09-14 22:47:53 +00:00
parent b3ee318b79
commit a1c555f48b
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/fs/devfs/devfs.h
View file

@ -185,8 +185,7 @@ extern unsigned devfs_rule_depth;
#define DEVFS_DMP_HOLD(dmp) ((dmp)->dm_holdcnt++)
#define DEVFS_DMP_DROP(dmp) (--(dmp)->dm_holdcnt == 0)
#define DEVFS_DEL_VNLOCKED 0x01
#define DEVFS_DEL_NORECURSE 0x02
#define DEVFS_DEL_NORECURSE 0x01
void devfs_rules_apply(struct devfs_mount *, struct devfs_dirent *);
void devfs_rules_cleanup(struct devfs_mount *);

8
sys/fs/devfs/devfs_devs.c
View file

@ -401,13 +401,9 @@ devfs_delete(struct devfs_mount *dm, struct devfs_dirent *de, int flags)
mtx_unlock(&devfs_de_interlock);
vholdl(vp);
sx_unlock(&dm->dm_lock);
if ((flags & DEVFS_DEL_VNLOCKED) == 0)
vn_lock(vp, LK_EXCLUSIVE | LK_INTERLOCK | LK_RETRY);
else
VI_UNLOCK(vp);
vn_lock(vp, LK_EXCLUSIVE | LK_INTERLOCK | LK_RETRY);
vgone(vp);
if ((flags & DEVFS_DEL_VNLOCKED) == 0)
VOP_UNLOCK(vp);
VOP_UNLOCK(vp);
vdrop(vp);
sx_xlock(&dm->dm_lock);
} else