svn commit: r189958 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb fs/devfs

[Konstantin Belousov]

Author: kib
Date: Wed Mar 18 13:19:46 2009
New Revision: 189958
URL: http://svn.freebsd.org/changeset/base/189958

Log:
  MFC r189693:
  Enable advisory file locking for devfs vnodes.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/fs/devfs/devfs_vnops.c

Modified: stable/7/sys/fs/devfs/devfs_vnops.c
==============================================================================
--- stable/7/sys/fs/devfs/devfs_vnops.c	Wed Mar 18 12:25:40 2009	(r189957)
+++ stable/7/sys/fs/devfs/devfs_vnops.c	Wed Mar 18 13:19:46 2009	(r189958)
@@ -387,14 +387,6 @@ devfs_access(struct vop_access_args *ap)
 
 /* ARGSUSED */
 static int
-devfs_advlock(struct vop_advlock_args *ap)
-{
-
-	return (ap->a_flags & F_FLOCK ? EOPNOTSUPP : EINVAL);
-}
-
-/* ARGSUSED */
-static int
 devfs_close(struct vop_close_args *ap)
 {
 	struct vnode *vp = ap->a_vp, *oldvp;
@@ -1501,7 +1493,6 @@ static struct vop_vector devfs_specops =
 	.vop_default =		&default_vnodeops,
 
 	.vop_access =		devfs_access,
-	.vop_advlock =		devfs_advlock,
 	.vop_bmap =		VOP_PANIC,
 	.vop_close =		devfs_close,
 	.vop_create =		VOP_PANIC,