diff options
| author | Attilio Rao <attilio@FreeBSD.org> | 2008-01-10 01:10:58 +0000 |
|---|---|---|
| committer | Attilio Rao <attilio@FreeBSD.org> | 2008-01-10 01:10:58 +0000 |
| commit | cb05b60a8982e5497cd30449710deb2f4be653d4 (patch) | |
| tree | c4e28d990eaa525916ab09f2bd1d9c6ddf2c8dea /sys/fs/devfs | |
| parent | 71e3b145e380a641c1129e0363ecb2f5ebbb09f2 (diff) | |
| download | src-cb05b60a8982e5497cd30449710deb2f4be653d4.tar.gz src-cb05b60a8982e5497cd30449710deb2f4be653d4.zip | |
vn_lock() is currently only used with the 'curthread' passed as argument.
Remove this argument and pass curthread directly to underlying
VOP_LOCK1() VFS method. This modify makes the code cleaner and in
particular remove an annoying dependence helping next lockmgr() cleanup.
KPI results, obviously, changed.
Manpage and FreeBSD_version will be updated through further commits.
As a side note, would be valuable to say that next commits will address
a similar cleanup about VFS methods, in particular vop_lock1 and
vop_unlock.
Tested by: Diego Sardina <siarodx at gmail dot com>,
Andrea Di Pasquale <whyx dot it at gmail dot com>
Notes
Notes:
svn path=/head/; revision=175202
Diffstat (limited to 'sys/fs/devfs')
| -rw-r--r-- | sys/fs/devfs/devfs_devs.c | 2 | ||||
| -rw-r--r-- | sys/fs/devfs/devfs_vnops.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c index 526f20d1cb50..7ca8e6bcb2ca 100644 --- a/sys/fs/devfs/devfs_devs.c +++ b/sys/fs/devfs/devfs_devs.c @@ -259,7 +259,7 @@ devfs_delete(struct devfs_mount *dm, struct devfs_dirent *de, int vp_locked) vholdl(vp); sx_unlock(&dm->dm_lock); if (!vp_locked) - vn_lock(vp, LK_EXCLUSIVE | LK_INTERLOCK | LK_RETRY, td); + vn_lock(vp, LK_EXCLUSIVE | LK_INTERLOCK | LK_RETRY); else VI_UNLOCK(vp); vgone(vp); diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 6cae05e717a7..5e4fa4d3d0b4 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -247,7 +247,7 @@ devfs_allocv(struct devfs_dirent *de, struct mount *mp, struct vnode **vpp, stru } else { vp->v_type = VBAD; } - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); mtx_lock(&devfs_de_interlock); vp->v_data = de; de->de_vnode = vp; @@ -372,7 +372,7 @@ devfs_close(struct vop_close_args *ap) error = dsw->d_close(dev, ap->a_fflag, S_IFCHR, td); } dev_relthread(dev); - vn_lock(vp, vp_locked | LK_RETRY, td); + vn_lock(vp, vp_locked | LK_RETRY); vdrop(vp); return (error); } @@ -593,7 +593,7 @@ devfs_lookupx(struct vop_lookup_args *ap, int *dm_unlock) de = de->de_dir; error = devfs_allocv(de, dvp->v_mount, vpp, td); *dm_unlock = 0; - vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY); return (error); } @@ -786,7 +786,7 @@ devfs_open(struct vop_open_args *ap) error = dsw->d_open(dev, ap->a_mode, S_IFCHR, td); } - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); dev_relthread(dev); @@ -1101,7 +1101,7 @@ devfs_revoke(struct vop_revoke_args *ap) } else dev_unlock(); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); return (0); } |