← Back to branch summary

~ubuntu-branches/debian/jessie/ufsutils/jessie

« back to all changes in this revision

Viewing changes to fsck.ufs/pass1.c

  • Committer: Bazaar Package Importer
  • Author(s): Aurelien Jarno, Petr Salinger, Aurelien Jarno
  • Date: 2010-04-13 22:20:32 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20100413222032-je6xhqdvomf3yrj2
Tags: 7.3-1
http://bugs.debian.org/559647
[ Petr Salinger ]
* New upstream version (RELENG_7_3_0_RELEASE)
* Use intmax_t cast in fsbtodb() to fix aborts when 
  making a filesystem larger than one terabyte. Closes: #559647.

[ Aurelien Jarno ]
* Bump Standard-Versions to 3.8.4 (no changes).

Show diffs side-by-side

added added

removed removed

Lines of Context:
fsck.ufs/pass1.c
33
33
#endif /* not lint */
34
34
#endif
35
35
#include <sys/cdefs.h>
36
 
__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.43.20.1 2009/04/15 03:14:26 kensmith Exp $");
 
36
__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.43.10.1.2.1 2010/02/10 00:26:20 kensmith Exp $");
37
37
 
38
38
#include <sys/param.h>
39
39
#include <sys/stat.h>
93
93
                inumber = c * sblock.fs_ipg;
94
94
                setinodebuf(inumber);
95
95
                getblk(&cgblk, cgtod(&sblock, c), sblock.fs_cgsize);
96
 
                if (sblock.fs_magic == FS_UFS2_MAGIC)
 
96
                if (sblock.fs_magic == FS_UFS2_MAGIC) {
97
97
                        inosused = cgrp.cg_initediblk;
98
 
                else
 
98
                        if (inosused > sblock.fs_ipg)
 
99
                                inosused = sblock.fs_ipg;
 
100
                } else
99
101
                        inosused = sblock.fs_ipg;
100
102
                if (got_siginfo) {
101
103
                        printf("%s: phase 1: cyl group %d of %d (%d%%)\n",