Deleted Added
sdiff udiff text old ( 214921 ) new ( 241015 )
full compact
ffs_alloc.c (214921) ffs_alloc.c (241015)
1/* $NetBSD: ffs_alloc.c,v 1.14 2004/06/20 22:20:18 jmc Exp $ */
2/* From: NetBSD: ffs_alloc.c,v 1.50 2001/09/06 02:16:01 lukem Exp */
3
4/*
5 * Copyright (c) 2002 Networks Associates Technology, Inc.
6 * All rights reserved.
7 *
8 * This software was developed for the FreeBSD Project by Marshall

--- 28 unchanged lines hidden (view full) ---

37 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
38 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
39 * SUCH DAMAGE.
40 *
41 * @(#)ffs_alloc.c 8.19 (Berkeley) 7/13/95
42 */
43
44#include <sys/cdefs.h>
1/* $NetBSD: ffs_alloc.c,v 1.14 2004/06/20 22:20:18 jmc Exp $ */
2/* From: NetBSD: ffs_alloc.c,v 1.50 2001/09/06 02:16:01 lukem Exp */
3
4/*
5 * Copyright (c) 2002 Networks Associates Technology, Inc.
6 * All rights reserved.
7 *
8 * This software was developed for the FreeBSD Project by Marshall

--- 28 unchanged lines hidden (view full) ---

37 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
38 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
39 * SUCH DAMAGE.
40 *
41 * @(#)ffs_alloc.c 8.19 (Berkeley) 7/13/95
42 */
43
44#include <sys/cdefs.h>
45__FBSDID("$FreeBSD: head/usr.sbin/makefs/ffs/ffs_alloc.c 214921 2010-11-07 16:05:04Z cognet $");
45__FBSDID("$FreeBSD: head/usr.sbin/makefs/ffs/ffs_alloc.c 241015 2012-09-27 23:31:19Z mdf $");
46
47#include <sys/param.h>
48#include <sys/time.h>
49
50#include <errno.h>
46
47#include <sys/param.h>
48#include <sys/time.h>
49
50#include <errno.h>
51#include <stdint.h>
51
52#include "makefs.h"
53
54#include <ufs/ufs/dinode.h>
55#include <ufs/ffs/fs.h>
56
57#include "ffs/ufs_bswap.h"
58#include "ffs/buf.h"

--- 375 unchanged lines hidden (view full) ---

434
435 if (size > fs->fs_bsize || fragoff(fs, size) != 0 ||
436 fragnum(fs, bno) + numfrags(fs, size) > fs->fs_frag) {
437 errx(1, "blkfree: bad size: bno %lld bsize %d size %ld",
438 (long long)bno, fs->fs_bsize, size);
439 }
440 cg = dtog(fs, bno);
441 if (bno >= fs->fs_size) {
52
53#include "makefs.h"
54
55#include <ufs/ufs/dinode.h>
56#include <ufs/ffs/fs.h>
57
58#include "ffs/ufs_bswap.h"
59#include "ffs/buf.h"

--- 375 unchanged lines hidden (view full) ---

435
436 if (size > fs->fs_bsize || fragoff(fs, size) != 0 ||
437 fragnum(fs, bno) + numfrags(fs, size) > fs->fs_frag) {
438 errx(1, "blkfree: bad size: bno %lld bsize %d size %ld",
439 (long long)bno, fs->fs_bsize, size);
440 }
441 cg = dtog(fs, bno);
442 if (bno >= fs->fs_size) {
442 warnx("bad block %lld, ino %llu", (long long)bno,
443 (unsigned long long)ip->i_number);
443 warnx("bad block %lld, ino %ju", (long long)bno,
444 (uintmax_t)ip->i_number);
444 return;
445 }
446 error = bread(ip->i_fd, ip->i_fs, fsbtodb(fs, cgtod(fs, cg)),
447 (int)fs->fs_cgsize, &bp);
448 if (error) {
449 brelse(bp);
450 return;
451 }

--- 229 unchanged lines hidden --- 		445 return;
446 }
447 error = bread(ip->i_fd, ip->i_fs, fsbtodb(fs, cgtod(fs, cg)),
448 (int)fs->fs_cgsize, &bp);
449 if (error) {
450 brelse(bp);
451 return;
452 }

--- 229 unchanged lines hidden ---