GitLab

* commit '78374f04':
  llseek: setup the correct seek for ext2fs_llseek

Or else ...:
  In file included from e2fsck/pass5.c:21:
  e2fsck/problem.h:13: error: redefinition of typedef ‘__u32’
  lib/ext2fs/ext2_types.h:56: error: previous declaration of ‘__u32’ was here
  e2fsck/problem.h:14: error: redefinition of typedef ‘errcode_t’
  lib/et/com_err.h:22: error: previous declaration of ‘errcode_t’ was here

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

After
  http://git.kernel.org/cgit/fs/ext2/e2fsprogs.git/commit/lib/ext2fs/llseek.c?id=274d46e1d35af423d0292d63c4d0ad7a03be82ba



with
  __linux__
  defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE)
  SIZEOF_OFF_T >= SIZEOF_LONG_LONG
it leads to ext2fs_llseek() doing a "return lseek(fd, offset, origin);"
Which  fails for offsets > 32bit.

Also, with
  __linux__
  !(defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE))
  defined(HAVE_LLSEEK)
  SIZEOF_OFF_T == SIZEOF_LONG_LONG
my_llseek is not defined at all. And there is no need to define
llseek as lseek, as llseek is never used.
Luckily ext2fs_llseek() then does "return lseek(...);"
It would seem that my_llseek should be used in both places.

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

After
  http://git.kernel.org/cgit/fs/ext2/e2fsprogs.git/commit/lib/ext2fs/llseek.c?id=274d46e1d35af423d0292d63c4d0ad7a03be82ba



with
  __linux__
  defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE)
  SIZEOF_OFF_T >= SIZEOF_LONG_LONG
it leads to ext2fs_llseek() doing a "return lseek(fd, offset, origin);"
Which  fails for offsets > 32bit.

Also, with
  __linux__
  !(defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE))
  defined(HAVE_LLSEEK)
  SIZEOF_OFF_T == SIZEOF_LONG_LONG
my_llseek is not defined at all. And there is no need to define
llseek as lseek, as llseek is never used.
Luckily ext2fs_llseek() then does "return lseek(...);"
It would seem that my_llseek should be used in both places.

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

Revert "Revert changes that moved from 1.41.14 to 1.42.9"

This reverts commit 65f0aab9.

* commit '9d965309':
  e2fsck: remove unneeded type redefinitions

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>

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>

Or else ...:
  In file included from e2fsck/pass5.c:21:
  e2fsck/problem.h:13: error: redefinition of typedef ‘__u32’
  lib/ext2fs/ext2_types.h:56: error: previous declaration of ‘__u32’ was here
  e2fsck/problem.h:14: error: redefinition of typedef ‘errcode_t’
  lib/et/com_err.h:22: error: previous declaration of ‘errcode_t’ was here

Change-Id: I0a1ff3b2455bfbaf1e3d0940034a7dbcc231a0f7
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>