aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseKousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am skip reason: Change-Id I63ab1719ee1d0ccd28907f0bc99531260251fa99 with SHA-1 ec10b513c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: I5c25659d8950d2e2e13099c463f2b084e77e9670
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: I273745e63265ee26074d9be46115ad01b967bad9
2020-09-01[DO NOT MERGE] Change #define to _BLKID_TYPES_H am: 82c0e62db7Kousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: I74edfc1e781a2851a1a518ab0b07511ca008f9c0
2020-08-31[DO NOT MERGE] Change #define to _BLKID_TYPES_HKousik Kumar
blkid_types.h and ext_types.h having the exact same content results in mismatches in remote RBE builds. Given blkid_types.h is actually supposed to be different, changing this to remove the mismatch. Test: Ran a build, and all e2fsprogs mismatches went away between local/remote. Bug: b/166182389 Change-Id: Ia71e9e37035198dc3a44b38e41221fb65f048b15 Merged-In: I63ab1719ee1d0ccd28907f0bc99531260251fa99
2020-06-24ANDROID: e2fsck: Handle casefolded encryption am: 156028c42eDaniel Rosenberg
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11205331 Change-Id: Ic08edc01504e783c44ac73954887db8becfe1a8f
2020-06-24ANDROID: mke2fs: Support encrypt+casefold am: 4e37e48fd3Daniel Rosenberg
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11835204 Change-Id: I1fbcab417833b19b697d1a8a2a135d7afc53d22b
2020-06-24ANDROID: tune2fs: Support encrypt+casefold am: 5507593a03Daniel Rosenberg
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11835203 Change-Id: Id85efdff53cb63e3245055389cb21191ec5c0363
2020-06-24ANDROID: e2fsck: Do not mutate encrypted names am: 0c0b65bdccDaniel Rosenberg
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11850659 Change-Id: I21a49904141f9d8851a45819a9268cb5f3a37a4b
2020-06-24ANDROID: tune2fs: Allow setting the casefold feature am: 4b8ccd34c9Daniel Rosenberg
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11205030 Change-Id: Ia2d8dacfc28eb55163a4aa105b588dc56b26eeb6
2020-06-24ANDROID: e2fsck: Handle casefolded encryptionandroid11-devDaniel Rosenberg
Adds support for EXT2_HASH_SIPHASH, and reading the hash from disk in that case. We cannot compute the siphash without the key, so we must not modify the names of any encrypted and casefolded directories, which limits some recovery options, and we must assume the hashes stored in dirents are correct. This is in preparation for upcoming kernel support for encryption and casefolding at the same time. Bug: 159836819 Test: Create fs with casefold and encryption enabled via mke2fs and tune2fs, run fsck after creating casefolded + encrypted folder Change-Id: Icca32d7d9dd3c7f52da03d60e4d89273cbec0a7d
2020-06-24ANDROID: mke2fs: Support encrypt+casefoldDaniel Rosenberg
In preparation for upcoming kernel changes that will make the kernel support both encryption and casefolding at the same time, allow mke2fs to enable both features at the same time. Signed-off-by: Daniel Rosenberg <drosen@google.com> Bug: 159836819 Test: Create fs with casefold and encryption enabled via mke2fs Change-Id: I4e2350e43e21cffb3d972310cd74df1e662bf87e
2020-06-24ANDROID: tune2fs: Support encrypt+casefoldDaniel Rosenberg
In preparation for upcoming kernel changes that will make the kernel support both encryption and casefolding at the same time, allow tune2fs to enable both features at the same time. Signed-off-by: Daniel Rosenberg <drosen@google.com> Bug: 159836819 Test: Create fs with casefold and encryption enabled via tune2fs Change-Id: I36537a8b6dc5e2997b7016212f9b574c76673067
2020-06-24ANDROID: e2fsck: Do not mutate encrypted namesDaniel Rosenberg
We can't mutate a name without the key, as this will at best cause the name to become gibberish, and at worst may introduce invalid characters or even fail to be unique after decoding, so drop duplicates instead. Files lost in this way will be reconnected to lost+found Fixes: dbff534ec685 ("e2fsck: suppress bad name checks for encrypted directories") Signed-off-by: Daniel Rosenberg <drosen@google.com> Bug: 159836819 Test: f_dup_de_crypt Change-Id: I8d6cc3984872868a845fafabc554abdd86351fcc
2020-06-24ANDROID: tune2fs: Allow setting the casefold featureDaniel Rosenberg
This allows tune2fs to enable casefolding on an existing filesystem. At the moment, casefolding is incompatible with encryption. Signed-off-by: Daniel Rosenberg <drosen@google.com> Bug: 159836819 Test: Create fs without casefold and enable it via tune2fs Change-Id: Ic9ed63180ef28c36e083cee85ade432e4bfcc654
2020-03-11tune2fs, resize2fs: make ramdisk binaries.Jaegeuk Kim
Bug: 149391799 Change-Id: I5183755915710e28a603e3f718f16813ea9991a0 Merged-In: I5183755915710e28a603e3f718f16813ea9991a0 Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2020-02-21Merge changes from topic "vab-block-map" am: 5eb9aa7828 am: 5fef5f0256 am: ↵Automerger Merge Worker
0411967526 Change-Id: Ie90841f870830952979c544a3f8dac19efb4151c
2020-02-21Merge changes from topic "vab-block-map" am: 5eb9aa7828 am: 5fef5f0256Automerger Merge Worker
Change-Id: Ic2e15a037846354cda129294d5459ec2d0e69a53
2020-02-21Merge changes from topic "vab-block-map" am: 5eb9aa7828Automerger Merge Worker
Change-Id: I77083b6c4b53acb0363c3b9cbf4fb98786ded901
2020-02-21Merge changes from topic "vab-block-map"David Anderson
* changes: e2fsdroid: Don't skip unusable blocks in BaseFS. e2fsdroid: Fix logical block sequencing in BaseFS.
2020-02-15e2fsdroid: Don't skip unusable blocks in BaseFS.David Anderson
Currently, basefs_allocator will iterate through blocks owned by an inode until it finds a block that is free. This effectively ignores the logical to physical block mapping, which can lead to a bigger delta in the final image. An example of how this can happen is if the BaseFS has a deduplicated block (D), that is not deduplicated in the new image: Old image: 1 2 3 D 4 5 New image: 1 2 3 ? 4 5 If the allocator sees that "D" is not usable, and skips to block "4", we will have a non-ideal assignment. Bad image: 1 2 3 4 5 ? This patch refactors get_next_block() to acquire at most one block. It's called a single time, and then only called in a loop if absolutely no blocks can be acquired from anywhere else. In a Virtual A/B simulation, this reduces the COW snapshot size by about 90MB. Bug: 139201772 Test: manual test Change-Id: I354f0dee1ee191dba0e1f90491ed591dba388f7f
2020-02-15e2fsdroid: Fix logical block sequencing in BaseFS.David Anderson
By iterating over blocks to write BaseFS, holes in the extent tree are skipped. This is problematic because the purpose of BaseFS is to preserve the logical to physical block assignment between builds. By not preserving the location of holes, the assignment can be incorrect. For example, consider the following block list for a file: 1 2 3 0 4 5 If this is recorded as: 1 2 3 4 5 If the first block changes to a hole, the intended mapping will not be preserved at all: 0 1 2 0 3 This patch makes two changes to e2fsdroid to fix this. The first change is that holes are now recorded in BaseFS, by iterating over the extent tree rather than the block list, and inserting zeroes where appropriate. The second change is that the block allocator now recognizes when blocks have been skipped (either to deduplication or to holes), and skips the same number of logical blocks in BaseFS as well. In a Virtual A/B simulation, this reduces the COW snapshot size by approximately 100MB. Bug: 139201772 Test: m target-files-package, inspect .map files
2020-02-11Merge "e2fsdroid: Properly free the dedup block map." am: 1c68004c18 am: ↵Automerger Merge Worker
84d5d0245f am: d40c21d0ab Change-Id: I3e6ea117472a38694b82c05a4994708188f3dbdb
2020-02-11Merge "e2fsdroid: Properly free the dedup block map." am: 1c68004c18 am: ↵Automerger Merge Worker
84d5d0245f Change-Id: Ib65e3cd02283ee8eb3293ae8519f171c3e9dcb6a
2020-02-11Merge "e2fsdroid: Properly free the dedup block map." am: 1c68004c18Automerger Merge Worker
Change-Id: I33ad83170a1c38fd268f58e0540c01694a5ae082
2020-02-11Merge "e2fsdroid: Properly free the dedup block map."David Anderson
2020-02-07e2fsdroid: Properly free the dedup block map.David Anderson
When BaseFS specifies the same block for two files, it gets added to a separate "dedup" bitmap, and removed from the free block bitmap. If the new build does not use every block in this bitmap, there will be an inconsistency: the block bitmap marks blocks as in-use when they are actually free. Although this doesn't matter for AOSP's read-only file systems, it does cause e2fsck to complain, which breaks the build. Fix the inconsistency by properly freeing all unused blocks within the dedup block set. Bug: 139201772 Test: build AOSP using BaseFS Change-Id: I6b6511eb713a56fec932f1d5668f1766d64d9479
2020-02-04Merge "Build e2freefrag" am: e754e6de22 am: 006970020c am: b310425245Automerger Merge Worker
Change-Id: I54f4a83fd4e850999957969d8f740fa320094bc4
2020-02-04Merge "Build e2freefrag" am: e754e6de22 am: 006970020cAutomerger Merge Worker
Change-Id: Ia37bb4926959636668e4a451eb75f0f0c76aad4f
2020-02-04Merge "Build e2freefrag" am: e754e6de22Automerger Merge Worker
Change-Id: I122802224a78deb7ae2eb197196b48af39d78647
2020-02-04Merge "Build e2freefrag"Treehugger Robot
2020-02-01Merge "Add -e2fsprogs to the e2fsprogs chattr and lsattr." am: 6665073721 ↵Automerger Merge Worker
am: f0118f1292 am: 4032e9cc7f Change-Id: I02c307da109ce5b7926a49833b217b198b8b4d9b
2020-02-01Merge "Add -e2fsprogs to the e2fsprogs chattr and lsattr." am: 6665073721 ↵Automerger Merge Worker
am: f0118f1292 Change-Id: Idb8063421d3c862845e464badd86feef33a020b3
2020-02-01Merge "Add -e2fsprogs to the e2fsprogs chattr and lsattr." am: 6665073721Automerger Merge Worker
Change-Id: I9e1445ca45d704dc5622e847e81e487a5d684ad0
2020-02-01Merge "Add -e2fsprogs to the e2fsprogs chattr and lsattr."Elliott Hughes
2020-01-25Build e2freefragAlessio Balsini
Enable the build of e2freefrag to monitor the free space fragmentation in ext2/3/4 filesystems. Bug: 146078546 Test: m + e2freefrag on device Change-Id: Ia56e443a789ae881a03bdaeae1093567e1736c4c Signed-off-by: Alessio Balsini <balsini@google.com>
2020-01-25Merge "Make ramdisk_available." am: 2fd6ca7aa3 am: 45899b53df am: 8c4ca34addAutomerger Merge Worker
Change-Id: I6071528e32fd5761f0f331ab36688856e7771dba
2020-01-25Merge "Make ramdisk_available." am: 2fd6ca7aa3 am: 45899b53dfAutomerger Merge Worker
Change-Id: Ibfce6c09996f9fdffd6d4fe9c160186dd216bd7a
2020-01-24Merge "Make ramdisk_available."Yifan Hong
am: 2fd6ca7aa3 Change-Id: If1e6c5fcb289f4d2a45a05aa75513395497093f4
2020-01-24Merge "Make ramdisk_available."Yifan Hong
2020-01-23Add -e2fsprogs to the e2fsprogs chattr and lsattr.Elliott Hughes
We want to start shipping the toybox chattr and lsattr on the device all the time, so the build system rightly complains that then we'd have two modules with the same name. I went with a suffix rather than a prefix so that tab completion works for folks still wanting to use the e2fsprogs versions. Bug: http://b/147769529 Test: builds Change-Id: Ib904fa6c709d29ce709302c61e452383c02cb9a3
2020-01-22Make ramdisk_available.Yifan Hong
Test: pass Bug: 147347110 Change-Id: Ie800ba1b56773dcc1b6563c4f19c27eccb9ffc1a
2020-01-22Merge "Change #define to _BLKID_TYPES_H" am: d1c2a81fbb am: 4db9ff0c5d am: ↵Automerger Merge Worker
e7184bb33a Change-Id: I1655d97456e9a32bbd504c6d71b0d9f143e49f10
2020-01-22Merge "Change #define to _BLKID_TYPES_H" am: d1c2a81fbb am: 4db9ff0c5dAutomerger Merge Worker
Change-Id: I4f10b989d0073c82b1cf19d56d6d59578c3624c9
2020-01-22Merge "Change #define to _BLKID_TYPES_H"Kousik Kumar
am: d1c2a81fbb Change-Id: I51f0fd87a42750fd05279fd2c3938d4fdf06f817
2020-01-22Merge "Change #define to _BLKID_TYPES_H"Treehugger Robot
2020-01-16Change #define to _BLKID_TYPES_HKousik Kumar
blkid_types.h and ext_types.h having the exact same content results in mismatches in remote RBE builds. Given blkid_types.h is actually supposed to be different, changing this to remove the mismatch. Test: Ran a build, and all e2fsprogs mismatches went away between local/remote. Change-Id: I63ab1719ee1d0ccd28907f0bc99531260251fa99
2020-01-10Merge "Allow resize2fs to compile with BUILD_HOST_static" am: e2c8b268cf am: ↵Dario Freni
f60518df5e am: a2525a8eba Change-Id: I17f8b05fdbdd842e6aed7655a11cb50978bbd898
2020-01-10Merge "Allow resize2fs to compile with BUILD_HOST_static" am: e2c8b268cf am: ↵Automerger Merge Worker
f60518df5e Change-Id: I10d8a70a0d37da95953b7b970ac7c632ba1c1e39
2020-01-10Merge "Allow resize2fs to compile with BUILD_HOST_static"Dario Freni
am: e2c8b268cf Change-Id: Idaba3d9ea87ba35c46fabb028c62c928c3a5fd70
2020-01-10Merge "Allow resize2fs to compile with BUILD_HOST_static"Treehugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 20:56:46 +0000