| ffs_alloc.c (220374) | ffs_alloc.c (220985) |
|---|---|
| 1/*- 2 * Copyright (c) 2002 Networks Associates Technology, Inc. 3 * All rights reserved. 4 * 5 * This software was developed for the FreeBSD Project by Marshall 6 * Kirk McKusick and Network Associates Laboratories, the Security 7 * Research Division of Network Associates, Inc. under DARPA/SPAWAR 8 * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS --- 46 unchanged lines hidden (view full) --- 55 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 56 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 57 * SUCH DAMAGE. 58 * 59 * @(#)ffs_alloc.c 8.18 (Berkeley) 5/26/95 60 */ 61 62#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2002 Networks Associates Technology, Inc. 3 * All rights reserved. 4 * 5 * This software was developed for the FreeBSD Project by Marshall 6 * Kirk McKusick and Network Associates Laboratories, the Security 7 * Research Division of Network Associates, Inc. under DARPA/SPAWAR 8 * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS --- 46 unchanged lines hidden (view full) --- 55 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 56 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 57 * SUCH DAMAGE. 58 * 59 * @(#)ffs_alloc.c 8.18 (Berkeley) 5/26/95 60 */ 61 62#include <sys/cdefs.h> |
| 63__FBSDID("$FreeBSD: head/sys/ufs/ffs/ffs_alloc.c 220374 2011-04-05 21:26:05Z mckusick $"); | 63__FBSDID("$FreeBSD: head/sys/ufs/ffs/ffs_alloc.c 220985 2011-04-24 10:47:56Z kib $"); |
| 64 65#include "opt_quota.h" 66 67#include <sys/param.h> 68#include <sys/systm.h> 69#include <sys/bio.h> 70#include <sys/buf.h> 71#include <sys/conf.h> --- 935 unchanged lines hidden (view full) --- 1007 if (ip->i_gen == 0 || ++ip->i_gen == 0) 1008 ip->i_gen = arc4random() / 2 + 1; 1009 DIP_SET(ip, i_gen, ip->i_gen); 1010 if (fs->fs_magic == FS_UFS2_MAGIC) { 1011 vfs_timestamp(&ts); 1012 ip->i_din2->di_birthtime = ts.tv_sec; 1013 ip->i_din2->di_birthnsec = ts.tv_nsec; 1014 } | 64 65#include "opt_quota.h" 66 67#include <sys/param.h> 68#include <sys/systm.h> 69#include <sys/bio.h> 70#include <sys/buf.h> 71#include <sys/conf.h> --- 935 unchanged lines hidden (view full) --- 1007 if (ip->i_gen == 0 || ++ip->i_gen == 0) 1008 ip->i_gen = arc4random() / 2 + 1; 1009 DIP_SET(ip, i_gen, ip->i_gen); 1010 if (fs->fs_magic == FS_UFS2_MAGIC) { 1011 vfs_timestamp(&ts); 1012 ip->i_din2->di_birthtime = ts.tv_sec; 1013 ip->i_din2->di_birthnsec = ts.tv_nsec; 1014 } |
| 1015 ufs_prepare_reclaim(*vpp); |
|
| 1015 ip->i_flag = 0; | 1016 ip->i_flag = 0; |
| 1016 vnode_destroy_vobject(*vpp); | 1017 (*vpp)->v_vflag = 0; |
| 1017 (*vpp)->v_type = VNON; 1018 if (fs->fs_magic == FS_UFS2_MAGIC) 1019 (*vpp)->v_op = &ffs_vnodeops2; 1020 else 1021 (*vpp)->v_op = &ffs_vnodeops1; 1022 return (0); 1023noinodes: 1024 if (fs->fs_pendinginodes > 0 && reclaimed == 0) { --- 1702 unchanged lines hidden --- | 1018 (*vpp)->v_type = VNON; 1019 if (fs->fs_magic == FS_UFS2_MAGIC) 1020 (*vpp)->v_op = &ffs_vnodeops2; 1021 else 1022 (*vpp)->v_op = &ffs_vnodeops1; 1023 return (0); 1024noinodes: 1025 if (fs->fs_pendinginodes > 0 && reclaimed == 0) { --- 1702 unchanged lines hidden --- |