From owner-svn-src-all@FreeBSD.ORG Wed Mar 18 13:19:47 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 367DE1065672; Wed, 18 Mar 2009 13:19:47 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 22F348FC1D; Wed, 18 Mar 2009 13:19:47 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2IDJlIJ027223; Wed, 18 Mar 2009 13:19:47 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2IDJlrj027222; Wed, 18 Mar 2009 13:19:47 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <200903181319.n2IDJlrj027222@svn.freebsd.org> From: Konstantin Belousov Date: Wed, 18 Mar 2009 13:19:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189958 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb fs/devfs X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Mar 2009 13:19:49 -0000 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,