From a3d13e5054285ec589040bfee20293cad1e95dd0 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Mon, 24 Feb 1997 16:44:11 +0000 Subject: [PATCH] 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. --- sys/fs/procfs/procfs_vnops.c | 10 +++++----- 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 8aaa015feb7..e2834b221c3 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 8aaa015feb7..e2834b221c3 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)