diff options
author | bde <bde@FreeBSD.org> | 1997-02-24 16:44:11 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1997-02-24 16:44:11 +0000 |
commit | 652d0883c73bef2b85091f018bd935341f2b43a7 (patch) | |
tree | 4f2ce2b4107c5eda24fdaec6165a100cd50752de /sys | |
parent | aa03d66ddb8d16bbedd703a185a2b4567249d1e5 (diff) | |
download | FreeBSD-src-652d0883c73bef2b85091f018bd935341f2b43a7.zip FreeBSD-src-652d0883c73bef2b85091f018bd935341f2b43a7.tar.gz |
Fixed procfs's locking vops. They were missed in the Lite2 merge,
partly because the #define's for them were moved to a different
file. At least the null VOP_LOCK() no longer works, since vclean()
expects VOP_LOCK( ..., LK_DRAIN | LK_INTERLOCK, ...) to clear the
interlock. This probably only matters when simple_lock() is not
null, i.e., when there are multiple CPUs or SIMPLELOCK_DEBUG is
defined.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/fs/procfs/procfs_vnops.c | 10 | ||||
-rw-r--r-- | sys/miscfs/procfs/procfs_vnops.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c index 8aaa015..e2834b2 100644 --- a/sys/fs/procfs/procfs_vnops.c +++ b/sys/fs/procfs/procfs_vnops.c @@ -36,7 +36,7 @@ * * @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95 * - * $Id$ + * $Id: procfs_vnops.c,v 1.28 1997/02/22 09:40:31 peter Exp $ */ /* @@ -949,11 +949,11 @@ atopid(b, len) #define procfs_mkdir ((int (*) __P((struct vop_mkdir_args *))) procfs_badop) #define procfs_rmdir ((int (*) __P((struct vop_rmdir_args *))) procfs_badop) #define procfs_symlink ((int (*) __P((struct vop_symlink_args *))) procfs_badop) -#define procfs_readlink ((int (*) __P((struct vop_readlink_args *))) procfs_badop) -#define procfs_lock ((int (*) __P((struct vop_lock_args *))) nullop) -#define procfs_unlock ((int (*) __P((struct vop_unlock_args *))) nullop) +#define procfs_lock ((int (*) __P((struct vop_lock_args *)))vop_nolock) +#define procfs_unlock ((int (*) __P((struct vop_unlock_args *)))vop_nounlock) #define procfs_strategy ((int (*) __P((struct vop_strategy_args *))) procfs_badop) -#define procfs_islocked ((int (*) __P((struct vop_islocked_args *))) nullop) +#define procfs_islocked \ + ((int (*) __P((struct vop_islocked_args *)))vop_noislocked) #define procfs_advlock ((int (*) __P((struct vop_advlock_args *))) procfs_badop) #define procfs_blkatoff ((int (*) __P((struct vop_blkatoff_args *))) procfs_badop) #define procfs_valloc ((int (*) __P((struct vop_valloc_args *))) procfs_badop) diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c index 8aaa015..e2834b2 100644 --- a/sys/miscfs/procfs/procfs_vnops.c +++ b/sys/miscfs/procfs/procfs_vnops.c @@ -36,7 +36,7 @@ * * @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95 * - * $Id$ + * $Id: procfs_vnops.c,v 1.28 1997/02/22 09:40:31 peter Exp $ */ /* @@ -949,11 +949,11 @@ atopid(b, len) #define procfs_mkdir ((int (*) __P((struct vop_mkdir_args *))) procfs_badop) #define procfs_rmdir ((int (*) __P((struct vop_rmdir_args *))) procfs_badop) #define procfs_symlink ((int (*) __P((struct vop_symlink_args *))) procfs_badop) -#define procfs_readlink ((int (*) __P((struct vop_readlink_args *))) procfs_badop) -#define procfs_lock ((int (*) __P((struct vop_lock_args *))) nullop) -#define procfs_unlock ((int (*) __P((struct vop_unlock_args *))) nullop) +#define procfs_lock ((int (*) __P((struct vop_lock_args *)))vop_nolock) +#define procfs_unlock ((int (*) __P((struct vop_unlock_args *)))vop_nounlock) #define procfs_strategy ((int (*) __P((struct vop_strategy_args *))) procfs_badop) -#define procfs_islocked ((int (*) __P((struct vop_islocked_args *))) nullop) +#define procfs_islocked \ + ((int (*) __P((struct vop_islocked_args *)))vop_noislocked) #define procfs_advlock ((int (*) __P((struct vop_advlock_args *))) procfs_badop) #define procfs_blkatoff ((int (*) __P((struct vop_blkatoff_args *))) procfs_badop) #define procfs_valloc ((int (*) __P((struct vop_valloc_args *))) procfs_badop) |