GitLab

Revert "e2fsck: Don't use e2fsck_global_ctx unless HAVE_SIGNAL_H"
  commit e80e74c4.

Revert "Merge remote-tracking branch 'linaro/linaro-1.42.9' into aosp_master"
  This reverts commit e97b2b6f, reversing
  changes made to 7e2fb9d0.

Revert "Prepare for upstream 1.42.9"
 This reverts commit 7e2fb9d0

.

Bug: 13340735
Change-Id: If48b153a95ef5f69f7cdccb00e23524abff3c5a8
Signed-off-by: JP Abgrall <jpa@google.com>

* commit '166bc333':
  e2fsck: Don't use e2fsck_global_ctx unless HAVE_SIGNAL_H

Program received signal SIGSEGV, Segmentation fault.
0x56577382 in e2fsck_set_bitmap_type (fs=0x5658c2b8, default_type=2, profile_name=0x56580e12 "default", old_type=0x0) at external/e2fsprogs/e2fsck/util.c:797
797             profile_get_uint(e2fsck_global_ctx->profile, "bitmaps",

e2fsck_global_ctx is only ever initialized in unix.c PRS()
if HAVE_SIGNAL_H is defined.

Change-Id: Ic93fb8d9114054f7bf8512c622b2fb9b2ae60584
Signed-off-by: JP Abgrall <jpa@google.com>

Program received signal SIGSEGV, Segmentation fault.
0x56577382 in e2fsck_set_bitmap_type (fs=0x5658c2b8, default_type=2, profile_name=0x56580e12 "default", old_type=0x0) at external/e2fsprogs/e2fsck/util.c:797
797             profile_get_uint(e2fsck_global_ctx->profile, "bitmaps",

e2fsck_global_ctx is only ever initialized in unix.c PRS()
if HAVE_SIGNAL_H is defined.

Change-Id: Ic93fb8d9114054f7bf8512c622b2fb9b2ae60584
Signed-off-by: JP Abgrall <jpa@google.com>

* linaro/linaro-1.42.9: (4262 commits)
  Add missing libext2_quota linkage and resource_track.c
  Fix blkid time diff bug, build binary.
  Add files that would normally be generated by the e2fsprogs build system
  Re-add Android makefiles from AOSP master
  Update release notes, etc., for final 1.42.9 release
  po: update vi.po (from translationproject.org)
  po: update tr.po (from translationproject.org)
  po: update sv.po (from translationproject.org)
  po: update pl.po (from translationproject.org)
  po: update nl.po (from translationproject.org)
  po: update fr.po (from translationproject.org)
  po: update de.po (from translationproject.org)
  po: update cs.po (from translationproject.org)
  po: update ca.po (from translationproject.org)
  e2freefrag: avoid integer overflow when reporting free space statistics
  debugfs: document the lsdel command in the man page
  mke2fs: clarify documentation about bigalloc in the man page
  debian: fix cross build support
  mke2fs: clarify the description of the -I option in the man page
  debian: update debian-policy conormance to 3.9.5
  ...

Remove everything.

Change-Id: I6ef4c9bc888a245744d7ec4d193857b357472392
Signed-off-by: JP Abgrall <jpa@google.com>

Change-Id: If3983d882f97c5b4cfaf2a177d5d84c68c66fad3
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

When calculating time diffs, use difftime() instead of risking
integer overflow.  Also build a "blkid" binary.

Bug: 11175082
Change-Id: I23521f45204574bb32f152926401c2cbad93175b

Android doesn't run ./configure and friends, so it has to rely on
pre-populated versions of the autogenerated files.

This is somewhat bogus (e.g. hardcoded little-endian reference in
lib/ext2fs/ext2_types.h) and should at some point be fixed, but it's
what Android has always done, not a regression from the 1.41.14 branch.

Also, don't #include config.h which we don't generate (we pass what it
usually contains as -D parameters from Android.mk) anywhere.

Add a new Android.mk file for the quota library.

Change-Id: I162c6327fee5bd06261d9cdcc34bda10f04a6f21
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>

Change-Id: I6c6dbe11baa395442f4cf845ad39801f1c426129
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

An integer overflow could happen if the file system is large and has
very large contiguous chunks of free space.

Addresses-Debian-Bug: #718205
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Addresses-Debian-Bug: #731329
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Addresses-Debian-Bug: #669730
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

We need to explicitly specify the $DEB_BUILD_HOST when querying for
the version of the libblkid1 package.

Addresses-Debian-Bug: #721365
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Addresses-Debian-Bug: #698076
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

The texi2html utility from the texi2html ceased being developed
upstream in 2011, and upstream has declared it superseded by the
makeinfo utility from the texinfo package.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Also reflect a similar change to e2image's man page.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

This allows "e2image -rp /dev/sdc1 - | bzip2 > sdc1.img.bz2" to work
correctly, so the progress information doesn't corrupt the image being
sent to stdout.

Also add a diagnostic indicating that the -p option is currently only
implemented for raw mode.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

The old progress reporting code would crash on small file systems.
For example:

    cp /dev/null /tmp/foo.img
    mke2fs -t ext4 -F /tmp/foo.img 100
    e2image -o 0 -O 4096 -rap /tmp/foo.img

Fix this, and while we're at it, factor out the code to make it easier
to read and maintain.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

If dumpe2fs tries to print journal info when using an image file
created using e2image, it will crash since the journal isn't
available.  So don't even try to print it.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

The e2image progam was originally intended to create image files.
However, some people have started using e2image to copy a file system
from one block device to another, since it is more efficient than
using dd because it only copies the blocks which are in use.  If we
are doing this, however, we must not skip writing blocks which are all
zero in the source device, since they may not be zero in the
destination device.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Phillip Susi <psusi@ubuntu.com>

Fix up the gcc -Wall and sparse nits introduced by Phillip Susi's
e2image patches.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Phillip Susi <psusi@ubuntu.com>

Refactor calls to ext2fs_llseek().  This makes the code more compact,
easier to read, and it also fixes a number of places where we call
ext2fs_llseek() without doing proper error checking.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>