← Back to branch summary

~daniel-mehrmann/e2fsprogs/master

« back to all changes in this revision

Viewing changes to e2fsck/pass1.c

  • Committer: Package Import Robot
  • Author(s): Dmitrijs Ledkovs
  • Date: 2012-06-14 13:01:21 UTC
  • mfrom: (8.4.18 sid)
  • Revision ID: package-import@ubuntu.com-20120614130121-t2gct0d09jepx0y6
Tags: 1.42.4-3ubuntu1
https://launchpad.net/bugs/978012
* Merge from Debian unstable (LP: #978012), remainging changes:
  - debian/control.in: 
      Build-depend on gettext:any instead of on gettext for (cross-building)
      Drop build dependency on dc, which hasn't been needed for some time.
      Update maintainer field.
  - debian/rules:
      Block pkg-create-dbgsym from operating on this package.
      Build without dietlibc-dev, which is in universe 
  - debian/control:
      Regenerate with ./debian/rules debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
e2fsck/pass1.c
928
928
                        ext2fs_mark_inode_bitmap2(ctx->inode_used_map, ino);
929
929
                        if ((fs->super->s_feature_ro_compat &
930
930
                                        EXT4_FEATURE_RO_COMPAT_QUOTA) &&
931
 
                            (fs->super->s_usr_quota_inum == ino) ||
932
 
                            (fs->super->s_grp_quota_inum == ino)) {
 
931
                            ((fs->super->s_usr_quota_inum == ino) ||
 
932
                             (fs->super->s_grp_quota_inum == ino))) {
933
933
                                if (!LINUX_S_ISREG(inode->i_mode) &&
934
934
                                    fix_problem(ctx, PR_1_QUOTA_BAD_MODE,
935
935
                                                        &pctx)) {
1779
1779
                        problem = PR_1_EXTENT_BAD_START_BLK;
1780
1780
                else if (extent.e_lblk < start_block)
1781
1781
                        problem = PR_1_OUT_OF_ORDER_EXTENTS;
1782
 
                else if (extent.e_len == 0)
 
1782
                else if (is_leaf && extent.e_len == 0)
1783
1783
                        problem = PR_1_EXTENT_LENGTH_ZERO;
1784
1784
                else if (is_leaf &&
1785
1785
                         (extent.e_pblk + extent.e_len) >