| ffs_vfsops.c (210172) | ffs_vfsops.c (211531) |
|---|---|
| 1/*- 2 * Copyright (c) 1989, 1991, 1993, 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 16 unchanged lines hidden (view full) --- 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 * 29 * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 30 */ 31 32#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1989, 1991, 1993, 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 16 unchanged lines hidden (view full) --- 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 * 29 * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 30 */ 31 32#include <sys/cdefs.h> |
| 33__FBSDID("$FreeBSD: head/sys/ufs/ffs/ffs_vfsops.c 210172 2010-07-16 19:52:03Z jhb $"); | 33__FBSDID("$FreeBSD: head/sys/ufs/ffs/ffs_vfsops.c 211531 2010-08-20 19:46:50Z jhb $"); |
| 34 35#include "opt_quota.h" 36#include "opt_ufs.h" 37#include "opt_ffs.h" 38#include "opt_ddb.h" 39 40#include <sys/param.h> 41#include <sys/systm.h> --- 1454 unchanged lines hidden (view full) --- 1496 if (error) { 1497 *vpp = NULL; 1498 uma_zfree(uma_inode, ip); 1499 return (error); 1500 } 1501 /* 1502 * FFS supports recursive locking. 1503 */ | 34 35#include "opt_quota.h" 36#include "opt_ufs.h" 37#include "opt_ffs.h" 38#include "opt_ddb.h" 39 40#include <sys/param.h> 41#include <sys/systm.h> --- 1454 unchanged lines hidden (view full) --- 1496 if (error) { 1497 *vpp = NULL; 1498 uma_zfree(uma_inode, ip); 1499 return (error); 1500 } 1501 /* 1502 * FFS supports recursive locking. 1503 */ |
| 1504 lockmgr(vp->v_vnlock, LK_EXCLUSIVE, NULL); |
|
| 1504 VN_LOCK_AREC(vp); 1505 vp->v_data = ip; 1506 vp->v_bufobj.bo_bsize = fs->fs_bsize; 1507 ip->i_vnode = vp; 1508 ip->i_ump = ump; 1509 ip->i_fs = fs; 1510 ip->i_dev = dev; 1511 ip->i_number = ino; 1512 ip->i_ea_refs = 0; 1513#ifdef QUOTA 1514 { 1515 int i; 1516 for (i = 0; i < MAXQUOTAS; i++) 1517 ip->i_dquot[i] = NODQUOT; 1518 } 1519#endif 1520 | 1505 VN_LOCK_AREC(vp); 1506 vp->v_data = ip; 1507 vp->v_bufobj.bo_bsize = fs->fs_bsize; 1508 ip->i_vnode = vp; 1509 ip->i_ump = ump; 1510 ip->i_fs = fs; 1511 ip->i_dev = dev; 1512 ip->i_number = ino; 1513 ip->i_ea_refs = 0; 1514#ifdef QUOTA 1515 { 1516 int i; 1517 for (i = 0; i < MAXQUOTAS; i++) 1518 ip->i_dquot[i] = NODQUOT; 1519 } 1520#endif 1521 |
| 1521 lockmgr(vp->v_vnlock, LK_EXCLUSIVE, NULL); | |
| 1522 if (ffs_flags & FFSV_FORCEINSMQ) 1523 vp->v_vflag |= VV_FORCEINSMQ; 1524 error = insmntque(vp, mp); 1525 if (error != 0) { 1526 uma_zfree(uma_inode, ip); 1527 *vpp = NULL; 1528 return (error); 1529 } --- 515 unchanged lines hidden --- | 1522 if (ffs_flags & FFSV_FORCEINSMQ) 1523 vp->v_vflag |= VV_FORCEINSMQ; 1524 error = insmntque(vp, mp); 1525 if (error != 0) { 1526 uma_zfree(uma_inode, ip); 1527 *vpp = NULL; 1528 return (error); 1529 } --- 515 unchanged lines hidden --- |