Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

several ext2fs fixes provided by Barry Bouwsma: 

- set ip->i_e2fs_dtime to time_second, not time_uptime.
 - don't allow ipref to go negative
 - fs->e2fs.e2fs_icount is a valid inode number, allow it.
This commit is contained in:
chs 2006-12-09 22:07:48 +00:00
parent 74234c1818
commit 975004d9f1
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/ufs/ext2fs/ext2fs_alloc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_alloc.c,v 1.32 2006/11/16 01:33:51 christos Exp $ */
/* $NetBSD: ext2fs_alloc.c,v 1.33 2006/12/09 22:07:48 chs Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.32 2006/11/16 01:33:51 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.33 2006/12/09 22:07:48 chs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -441,6 +441,8 @@ ext2fs_nodealloccg(struct inode *ip, int cg, daddr_t ipref, int mode)
int error, start, len, loc, map, i;
ipref--; /* to avoid a lot of (ipref -1) */
if (ipref == -1)
ipref = 0;
fs = ip->i_e2fs;
if (fs->e2fs_gd[cg].ext2bgd_nifree == 0)
return (0);
@ -554,7 +556,7 @@ ext2fs_vfree(struct vnode *pvp, ino_t ino, int mode)
pip = VTOI(pvp);
fs = pip->i_e2fs;
if ((u_int)ino >= fs->e2fs.e2fs_icount || (u_int)ino < EXT2_FIRSTINO)
if ((u_int)ino > fs->e2fs.e2fs_icount || (u_int)ino < EXT2_FIRSTINO)
panic("ifree: range: dev = 0x%x, ino = %llu, fs = %s",
pip->i_dev, (unsigned long long)ino, fs->e2fs_fsmnt);
cg = ino_to_cg(fs, ino);

6
sys/ufs/ext2fs/ext2fs_inode.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_inode.c,v 1.55 2006/06/07 22:34:18 kardel Exp $ */
/* $NetBSD: ext2fs_inode.c,v 1.56 2006/12/09 22:07:48 chs Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ext2fs_inode.c,v 1.55 2006/06/07 22:34:18 kardel Exp $");
__KERNEL_RCSID(0, "$NetBSD: ext2fs_inode.c,v 1.56 2006/12/09 22:07:48 chs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -161,7 +161,7 @@ ext2fs_inactive(void *v)
if (ext2fs_size(ip) != 0) {
error = ext2fs_truncate(vp, (off_t)0, 0, NOCRED, NULL);
}
ip->i_e2fs_dtime = time_uptime;
ip->i_e2fs_dtime = time_second;
ip->i_flag |= IN_CHANGE | IN_UPDATE;
ext2fs_vfree(vp, ip->i_number, ip->i_e2fs_mode);
vn_finished_write(mp, V_LOWER);