| vfs_vnops.c (169658) | vfs_vnops.c (169671) |
|---|---|
| 1/*- 2 * Copyright (c) 1982, 1986, 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 21 unchanged lines hidden (view full) --- 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * SUCH DAMAGE. 33 * 34 * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 35 */ 36 37#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1982, 1986, 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 21 unchanged lines hidden (view full) --- 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * SUCH DAMAGE. 33 * 34 * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 35 */ 36 37#include <sys/cdefs.h> |
| 38__FBSDID("$FreeBSD: head/sys/kern/vfs_vnops.c 169658 2007-05-17 15:31:14Z peter $"); | 38__FBSDID("$FreeBSD: head/sys/kern/vfs_vnops.c 169671 2007-05-18 13:02:13Z kib $"); |
| 39 40#include "opt_mac.h" 41 42#include <sys/param.h> 43#include <sys/systm.h> 44#include <sys/fcntl.h> 45#include <sys/file.h> 46#include <sys/kdb.h> --- 768 unchanged lines hidden (view full) --- 815 if ((flags & LK_TYPE_MASK) == 0) { 816 VI_UNLOCK(vp); 817 return (0); 818 } 819 /* 820 * lockmgr drops interlock before it will return for 821 * any reason. So force the code above to relock it. 822 */ | 39 40#include "opt_mac.h" 41 42#include <sys/param.h> 43#include <sys/systm.h> 44#include <sys/fcntl.h> 45#include <sys/file.h> 46#include <sys/kdb.h> --- 768 unchanged lines hidden (view full) --- 815 if ((flags & LK_TYPE_MASK) == 0) { 816 VI_UNLOCK(vp); 817 return (0); 818 } 819 /* 820 * lockmgr drops interlock before it will return for 821 * any reason. So force the code above to relock it. 822 */ |
| 823 error = _VOP_LOCK(vp, flags | LK_INTERLOCK, td, file, line); | 823 error = VOP_LOCK1(vp, flags | LK_INTERLOCK, td, file, line); |
| 824 flags &= ~LK_INTERLOCK; 825 KASSERT((flags & LK_RETRY) == 0 || error == 0, 826 ("LK_RETRY set with incompatible flags %d\n", flags)); 827 /* 828 * Callers specify LK_RETRY if they wish to get dead vnodes. 829 * If RETRY is not set, we return ENOENT instead. 830 */ 831 if (error == 0 && vp->v_iflag & VI_DOOMED && --- 420 unchanged lines hidden --- | 824 flags &= ~LK_INTERLOCK; 825 KASSERT((flags & LK_RETRY) == 0 || error == 0, 826 ("LK_RETRY set with incompatible flags %d\n", flags)); 827 /* 828 * Callers specify LK_RETRY if they wish to get dead vnodes. 829 * If RETRY is not set, we return ENOENT instead. 830 */ 831 if (error == 0 && vp->v_iflag & VI_DOOMED && --- 420 unchanged lines hidden --- |