aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ignore quotes in safe_print().cm-11.0Jeff Sharkey2018-08-111-1/+3
| | | | | | | | | | | | | If the value being printed has embedded quotes ("), then printing those quotes could confuse other tools when parsing the value. This is the simplest CL to fix the security issue, and we can circle back to think about more robust escaping in a future CL. Bug: 80436257 Test: manual Change-Id: Ica17f2c5701573bceafe34f20110d230a3925483 (cherry picked from commit efe90c297a8df591c051fdbfacb92b5283390bba)
* e2fsprogs: blkid: Add Flash-Friendly File System (f2fs) supportcm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0Ketut Putu Kumajaya2014-03-193-0/+132
| | | | | | Backported from mainline util-linux Change-Id: I3afb543ed027786ee20c3e7c9093ff7f5af54a04
* Merge tag 'android-4.4.1_r1' into HEADcm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eaRicardo Cerqueira2013-12-062-2/+62
|\ | | | | | | Android 4.4.1 Release 1
| * Fix blkid time diff bug, build binary.Jeff Sharkey2013-10-162-2/+62
| | | | | | | | | | | | | | | | When calculating time diffs, use difftime() instead of risking integer overflow. Also build a "blkid" binary. Bug: 11175082 Change-Id: I23521f45204574bb32f152926401c2cbad93175b
* | Merge tag 'android-4.4_r1' into cm-11.0Ricardo Cerqueira2013-11-011-0/+138
|\| | | | | | | Android 4.4 Release 1.0
| * Enable chattr and lsattr in the e2fsprogs build.Ken Sumrall2013-05-131-0/+138
| | | | | | | | | | | | | | | | They are not installed in any build by default, but can now be easily made with mm if they are needed for debugging filesystem corruption issues. Change-Id: I32a118ba4e504f344c936451f5e22ecd73302c06
* | blkid: Add support for probing exFATcm-10.2.1cm-10.2.0cm-10.2-M1cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3stable/cm-10.2cm-10.2cm-10.1Steve Kondik2013-07-063-0/+189
| | | | | | | | | | | | | | * e2fsprogs can't currently detect exFAT filesystems. * Apply patch from GoogleTV to add support. Change-Id: Ib08bdb1d13e995d133a62539e3bfa0e3a22eeead
* | Fix dev time initialization for cache age caculationcm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2mr1.1-stagingJaap Versteegh2013-01-262-1/+5
| | | | | | | | | | | | | | | | | | dev->bid_time was initialized to INT_MIN causing an overflow in cache age calculation, which in turn caused a new device structure to not be filled with data due to assumed up-to-date values. Change-Id: I232e0a57d52777cf0ae6f5f7d01cbf8601a9011f
* | Merge branch 'jb-mr1-release' of ↵cm-10.1-M1Steve Kondik2012-11-18229-9046/+10865
|\| | | | | | | https://android.googlesource.com/platform/external/e2fsprogs into mr1-staging
| * am 5886dc5c: am fada3660: e2fsck: correctly propagate error from journal to ↵Theodore Ts'o2012-06-121-10/+8
| |\ | | | | | | | | | | | | | | | | | | superblock * commit '5886dc5cdcccd3d09a208d41d8c23748c25a2a22': e2fsck: correctly propagate error from journal to superblock
| | * am fada3660: e2fsck: correctly propagate error from journal to superblockTheodore Ts'o2012-06-121-10/+8
| | |\ | | | | | | | | | | | | | | | | * commit 'fada366033e80c119867eb303e8b48a8e027a9be': e2fsck: correctly propagate error from journal to superblock
| * | | am 0a02698f: am df5d2e2b: e2fsck: handle an already recovered journal with a ↵Theodore Ts'o2012-06-121-0/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | non-zero s_error field * commit '0a02698f2851f419aa75536afb5f040a5c9ce002': e2fsck: handle an already recovered journal with a non-zero s_error field
| | * | am df5d2e2b: e2fsck: handle an already recovered journal with a non-zero ↵Theodore Ts'o2012-06-121-0/+13
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | s_error field * commit 'df5d2e2b942bb263972fe30a4baafd68056e02bd': e2fsck: handle an already recovered journal with a non-zero s_error field
| * | | | am 493c82bb: am 97bd1b76: Revert "Fix e2fsck to run a full check if only the ↵Ken Sumrall2012-06-121-3/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | journal has recorded an error" * commit '493c82bb54397d2f46d2067bcedf966ea6da691f': Revert "Fix e2fsck to run a full check if only the journal has recorded an error"
| | * | | am 97bd1b76: Revert "Fix e2fsck to run a full check if only the journal has ↵Ken Sumrall2012-06-121-3/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recorded an error" * commit '97bd1b76758fc5c78b000df9a8bc3840e4f1d31c': Revert "Fix e2fsck to run a full check if only the journal has recorded an error"
| * | | | | am 766baba9: am a8948fce: Revert "Better fix for marking fs err in ↵Ken Sumrall2012-06-121-49/+55
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | superblock if err set in journal superblock." * commit '766baba9d08c13ec364f20ad70ca36303f186038': Revert "Better fix for marking fs err in superblock if err set in journal superblock."
| | * | | | am a8948fce: Revert "Better fix for marking fs err in superblock if err set ↵Ken Sumrall2012-06-121-49/+55
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in journal superblock." * commit 'a8948fce2be374a697f38bcefc8c33271b83b432': Revert "Better fix for marking fs err in superblock if err set in journal superblock."
| * | | | | | am 1f0e651e: am 46e96be1: Better fix for marking fs err in superblock if err ↵Ken Sumrall2012-06-071-55/+49
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set in journal superblock. * commit '1f0e651eb5b5d45bb68ef3902c40d9c32399bc9f': Better fix for marking fs err in superblock if err set in journal superblock.
| | * | | | | am 46e96be1: Better fix for marking fs err in superblock if err set in ↵Ken Sumrall2012-06-071-55/+49
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | journal superblock. * commit '46e96be157785a3582844efb27f4eef38943400b': Better fix for marking fs err in superblock if err set in journal superblock.
| * | | | | | | am 82ca75b8: am 8c157a2c: Fix e2fsck to run a full check if only the journal ↵Ken Sumrall2012-06-051-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has recorded an error * commit '82ca75b8ac7270a54aa5349a76e1df618023997d': Fix e2fsck to run a full check if only the journal has recorded an error
| | * | | | | | am 8c157a2c: Fix e2fsck to run a full check if only the journal has recorded ↵Ken Sumrall2012-06-041-0/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an error * commit '8c157a2c73b27b3f3ae566be78279460a35ccbc1': Fix e2fsck to run a full check if only the journal has recorded an error
| * | | | | | | | am a2e05ead: am 3e60e44f: Merge "Xcode 4.3 compatibility checkin"Jean-Baptiste Queru2012-05-041-0/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a2e05ead45f57030aa86a82bbaf891f28f7d5a58': Xcode 4.3 compatibility checkin
| | * | | | | | | am 3e60e44f: Merge "Xcode 4.3 compatibility checkin"Jean-Baptiste Queru2012-05-041-0/+8
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3e60e44fae35febb9da905394698b21b45ad7301': Xcode 4.3 compatibility checkin
| | | * \ \ \ \ \ \ Merge "Xcode 4.3 compatibility checkin"Jean-Baptiste Queru2012-05-041-0/+8
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Xcode 4.3 compatibility checkinAl Sutton2012-02-231-0/+8
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compilation on Xcode 4.3 does not handle inlined functions well and so the compile fails. This patch ensures that inlines are not used on that compiler. Signed-off-by: Al Sutton <al@funkyandroid.com>
| * | | | | | | | | Fix the mac build of e2fsprogsKen Sumrall2012-04-271-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android builds for MacOS 10.5. The new version version of e2fsprogs requires posix_memalign(), which was added in MacOS 10.6. Since MacOS doesn't provide memalign() either, the only option is to use valloc(). This patch was inspired by a patch to e2fsprogs that came from the macports port of e2fsprogs. Change-Id: If1334ce409985c1bdba4384ada8ecbc3dec56d81
| * | | | | | | | | Fix the mac host build of e2fsprogsKen Sumrall2012-04-261-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mac OS doesn't support the O_DIRECT flag, so use the F_NOCACHE option of fcntl() instead. Fix taken from the libext2 project on soruceforge. Change-Id: I1e88a95e53f1bbbd8dbcfc7aa43a27443dfd6807
| * | | | | | | | | Update e2fsprogs to version 1.41.14Ken Sumrall2011-12-14229-9046/+10833
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia1ae1df03ba5ae95f9437686285a6f5119c5aa9b
* | | | | | | | | static e2fsck, tune2fs, and mke2fs for recoveryjellybean-stablejellybeanKoushik Dutta2012-07-152-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8725cc296be8967265261e92da743c149e9ec45b
* | | | | | | | | build static e2fsprogsAusten Dicken2012-07-157-0/+105
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change makefies to build static mke2fs and tune2fs and place them in $(PRODUCT_OUT)/utilities Conflicts: e2fsck/Android.mk lib/blkid/Android.mk lib/ext2fs/Android.mk misc/Android.mk Change-Id: I0139b3dcfe64a4031db7719ddd71120d174d1990
* | | | | | | | e2fsck: correctly propagate error from journal to superblockTheodore Ts'o2012-06-111-10/+8
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the file system is mounted read-only after a file system error has been detected, the fact that an error occurred is written to the journal. This is important because while the journal is getting replayed, the error indication in the superblock may very well get overwritten. Unfortunately, the code to propagate the error indication from the journal to superblock was broken because this was being done before the old file system handle is thrown away and the file system is re-opened to ensure that no stale data is in the file system handle. As a result, the error indication in the superblock was never written out. To fix this, we need to move the check if the journal's error indicator has been set after the file system has been freed and re-open. Reported-by: Ken Sumrall <ksumrall@google.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* | | | | | | e2fsck: handle an already recovered journal with a non-zero s_error fieldTheodore Ts'o2012-06-111-0/+13
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a file system was remounted read-only after a file system corruption is detected, and then that file system is mounted and unmounted by the kernel, the journal would have been recovered, but the kernel currently leaves the s_errno field still set. This is arguably a bug, since it has already propgated the non-zero s_errno field to the file system superblock, where it will be retained until e2fsck has been run. However, e2fsck should handle this case for existing kernel by checking the journal superblock's s_errno field even if journal recovery is not required. Without this commit, e2fsck would not notice anything wrong with the file system, but a subsequent mount of the file system by the kernel would mark the file system's superblock as needing checking (since the journal's s_errno field would still be set), resulting an full e2fsck run at the next reboot, which would find nothing wrong --- and then when the file system was mounted, the whole cycle would repeat again. I had seen reports of this in the past, but it wasn't until recently that I realized exactly how this had come about, since normally e2fsck would be run automatically before the file system is mounted again, thus avoiding this problem. However, a user using a rescue CD who didn't run e2fsck before mounting the a file system in this condition could trigger this situation, and unfortunately, with previous versions of e2fsprogs and the kernel, there would be no way out no matter what the user tried to do. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
* | | | | | Revert "Fix e2fsck to run a full check if only the journal has recorded an ↵Ken Sumrall2012-06-111-3/+0
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | error" This reverts commit 8c157a2c73b27b3f3ae566be78279460a35ccbc1.
* | | | | Revert "Better fix for marking fs err in superblock if err set in journal ↵Ken Sumrall2012-06-111-49/+55
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | superblock." This reverts commit 46e96be157785a3582844efb27f4eef38943400b.
* | | | Better fix for marking fs err in superblock if err set in journal superblock.Ken Sumrall2012-06-061-55/+49
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous fix of flushing out the superblock after setting the EXT2_ERROR_FS flag was erroneous because running the journal could have updated the superblock (but not the in-memory copy the code referenced). So instead, check the journal error conditions after running the journal and freeing and re-opening the filesystem. Also, make sure to flush the error state of the superblock to disk before clearing the error state of the journal. Change-Id: Ia5cde1a367d86992c9bd3bca652a1289935d1380
* | | Fix e2fsck to run a full check if only the journal has recorded an errorKen Sumrall2012-06-041-0/+3
|/ / | | | | | | | | | | | | | | | | If only the journal superblock had recorded an error, but not the ext4 superblock, e2fsck would mark the superblock as containing an error. However, it was never flushed to disk before e2fsck restarted itself after recovering the journal, and the full check didn't happen. Change-Id: I2952b50d3f27c6b72b6167903dbc5a26c188df0c
* / Stop use of LOCAL_MODULE_STEM for libraries.Ying Wang2011-11-088-20/+8
|/ | | | | | | | | Bug: 5573756 The uses of LOCAL_MODULE_STEM are unnecessary here. To implement the feature requested by bug 5573756, we need library name to be the same as its module name. Change-Id: Ibbea9c1e1f4f8f2f5af0b467787ccb214c47d3fd
* am e20724c9: resolved conflicts for merge of 3154443d to gingerbread-plus-aospDavid 'Digit' Turner2011-07-130-0/+0
|\ | | | | | | | | * commit 'e20724c9c530e03bdeaf3f6ff31f2334ea7ffc72': Change systembuilder tag to optional
| * resolved conflicts for merge of 3154443d to gingerbread-plus-aospDavid 'Digit' Turner2011-07-120-0/+0
| |\ | | | | | | | | | Change-Id: I9f547b2e5ea97a503abd7a6a18811af309913345
| | * merge intel x86 patches into gingerbread branchDavid 'Digit' Turner2011-07-081-1/+1
| | |\
| | | * Change systembuilder tag to optionalBruce Beare2011-06-081-1/+1
| | |/ | | | | | | | | | | | | Orig-Change-Id: Ieb530c78ddd3968760eea209a4f02c9e9b781134 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
* | | Remove the simulator target from all makefiles.Jeff Brown2011-07-111-2/+0
| | | | | | | | | | | | | | | | | | Bug: 5010576 Change-Id: I335bcedd2aeab7da8e26ba975de6e02bfc062ee8
* | | Revert "external/e2fsprogs: remove LOCAL_PRELINK_MODULE"Jean-Baptiste Queru2011-05-066-12/+12
| | | | | | | | | | | | This reverts commit 89a994149ee53292ea7d9557f20d3828dc4aad3d.
* | | external/e2fsprogs: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-146-12/+12
|/ / | | | | | | | | Change-Id: Ic60cf9128945baa7319253e63b12b97ad230dc40 Signed-off-by: Iliyan Malchev <malchev@google.com>
* | ext4_utils: Convert all build target tags to optionalColin Cross2011-01-289-23/+22
| | | | | | | | | | | | | | | | A typo in the build target tags was causing them all to be left blank. use_e2fsprogs_module_tags is unused now, so change all targets to optional. Change-Id: Ie6cf18b8443c9b09b8b9e88fac3569b5527fec64
* | resolved conflicts for merge of 5ea5bedd to masterJean-Baptiste Queru2010-07-020-0/+0
|\ \ | | | | | | | | | Change-Id: I3238fb8cf7fcf6a20c53b59e27bcb68af7d44060
| * | Change systembuilder tag to optionalBruce Beare2010-07-011-1/+1
| |/ | | | | | | | | Change-Id: Ieb530c78ddd3968760eea209a4f02c9e9b781134 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
* | Make ext2 utils available to all buildsColin Cross2010-06-171-8/+1
| | | | | | | | Change-Id: I7aa64ec932982ec22febe7300750da50525a71c6
* | Fix build for darwin host.Nick Pelly2010-05-114-20/+44
| | | | | | | | Change-Id: I7c73c5c99b25e66ead23e3201790bb9735f36ce5
* | e2fsprogs: Build for host and targetColin Cross2010-05-0710-99/+311
| | | | | | | | Change-Id: I7e4a7893b5b30ca4117b659e2a6b339c1c278c24
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-15 15:20:28 +0000