platform_external_e2fsprogs/e2fsck, branch master

Fix e2fsdroid build with musl

2021-08-24T21:03:30+00:00

The e2fsdroid build fails with musl because config.h is not included
before ext2fs.h, which causes HAVE_SYS_TYPES_H not to be defined
resulting in a missing definition for dev_t.

Include config.h at the top of each .c file, and remove extra
config.h include from perms.h.

Bug: 190084016
Test: m USE_HOST_MUSL=true fastboot
Change-Id: I95b3fff3f10ba85c00ec049811dd6b5d412e5dd2

Move system_shared_libs into target.bionic clause

2021-07-13T23:29:01+00:00

Use target.bionic.system_shared_libs when it is used to limit the
default shared libraries (as opposed to remove them completely).
This avoids attempting to add a host dependency on libc when
system_shared_libs is modified to apply to all variants.

Also remove system_shared_libs from static binaries where it has
no effect, and consolidate it into e2fsprogs-defaults.

Bug: 193559105
Test: m checkbuild
Change-Id: I2d447b006afc783f4acd6c1acd93f338a68a01ed

Fix -Wunused-variable warnings

2021-06-16T05:11:52+00:00

Fix all warnings about unused variables that were introduced since
e2fsprogs v1.45.4.

Change-Id: I8804bc6f308237ddbeb5e12fd0af8d4d5c3b85b3

Fix -Wunused-parameter warnings

2021-06-16T05:11:52+00:00

Fix all warnings about unused function parameters that were introduced
since e2fsprogs v1.45.4, by adding EXT2FS_ATTR((unused)) or removing
parameters as appropriate.

Change-Id: Ie224bfbb9ab9601041cba60f7c084cf72d622bf2

e2fsck: sync fc_do_one_pass() changes from kernel

2021-06-16T05:11:52+00:00

Sync the changes to fc_do_one_pass() from the kernel's recovery.c so
that e2fsck picks up the fixes to the jbd_debug() statements.

Change-Id: If787d8a186c874ac13a5b4f3215c923843d5df9c

libext2fs: improve jbd_debug() implementation

2021-06-16T05:11:52+00:00

Make jbd_debug() do format string checking (but still get compiled away
to nothing) when --enable-jbd-debug isn't specified, similar to
commit d556435156b7 ("jbd2: avoid -Wempty-body warnings") on the kernel
side.  This should prevent --enable-jbd-debug from getting broken due to
bad jbd_debug() statements.  It also eliminates a -Wunused-variable
warning where a variable was only used in a jbd_debug() statement.

Also remove an alternative definition of jbd_debug() that was
conditional on CONFIG_JBD_DEBUG && !CONFIG_JBD_DEBUG, so was dead code.

Signed-off-by: Eric Biggers 
Change-Id: I7b975a89177e0142c9e6a3d51a127c7a70c150a6

Merge upstream tag 'v1.46.2' into aosp/master

2021-06-16T05:10:30+00:00

Conflicts:
	contrib/android/basefs_allocator.c
	e2fsck/e2fsck.h
	e2fsck/pass1.c
	e2fsck/pass2.c
	e2fsck/problem.c
	e2fsck/problem.h
	lib/e2p/feature.c
	lib/ext2fs/ext2_fs.h
	lib/ext2fs/ext2fs.h
	misc/mke2fs.c
	misc/tune2fs.c
	resize/Android.bp

Test: booted Cuttlefish using ext4 userdata
Change-Id: Iec94e79289afddd7efbca61b076c094da5e1fd6f

iscan: fix the test program iscan so it builds again

2021-02-26T22:18:48+00:00

The iscan program program isn't built by default, and was relying on
e2fsck's util.c, so it had suffered bitrot as e2fsck/util.c had
evolved.  Fix it so that iscan builds correct.

Signed-off-by: Theodore Ts'o

e2fsck: fix miscellaneous clang warnings

2021-02-23T18:03:37+00:00

Signed-off-by: Theodore Ts'o

e2fsck: initialize variable before first use in fast commit replay

2021-02-23T17:58:16+00:00

Initialize ext2fs_ex variable in ext4_fc_replay_scan() before first
use.  Also make sure ext2fs_decode_extent() completely overwrites the
extent structure passed to it as argument to prevent potential future
bugs for the users of the function.

Signed-off-by: Harshad Shirwadkar 
Signed-off-by: Theodore Ts'o