aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-09Snap for 11200327 from 721fe60da953e8907a6176eba8b51ed8e4f5a6c2 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: Ia7a9e8430deab5712a71c9ea9f86f98b6b8f3201
2023-12-08[automerger skipped] Skip UQ1A.231205.015 am: 15ac540162 -s ours am: ↵Xin Li
085eb330b6 -s ours am skip reason: Merged-In Iec409a7b3b58a1e8e55759a8d775d2de7e25608c with SHA-1 fbada0bc73 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25591287 Change-Id: Ib33d7bb76b9c7e4202176d815850c71c6ddc1362 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08[automerger skipped] Skip UQ1A.231205.015 am: 15ac540162 -s oursXin Li
am skip reason: Merged-In Iec409a7b3b58a1e8e55759a8d775d2de7e25608c with SHA-1 fbada0bc73 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25591287 Change-Id: I0b8769e5355a2e5f3a03c4c9377c259cb2cc11c2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Skip UQ1A.231205.015android-u-qpr3-beta-1-gplandroid-u-qpr2-beta-2-gplXin Li
Bug: 308969284 Merged-In: Iec409a7b3b58a1e8e55759a8d775d2de7e25608c Change-Id: Ibc1d3f3a5ab1e17df1a97b1e8ab5336ff3b15cc0
2023-11-11Snap for 11084970 from 8179d6280d0e7779cd830f666c63b8b9376b15d4 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I803f63c68c16bc0b7353c0a5570ce8fe91d35d4b
2023-11-10Upgrade f2fs-tools to f71fbf8f3dee4eefdddac1abaaf4ae76bb9a48b3 am: ↵Jaegeuk Kim
f5d5adbf61 am: d7509c7dd3 am: 5b708012f3 Original change: https://android-review.googlesource.com/c/platform/external/f2fs-tools/+/2825403 Change-Id: I69bc868fb7526cc70634b5c1bb09e098e86e76f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10Upgrade f2fs-tools to f71fbf8f3dee4eefdddac1abaaf4ae76bb9a48b3 am: ↵Jaegeuk Kim
f5d5adbf61 am: fbada0bc73 am: a08d617951 Original change: https://android-review.googlesource.com/c/platform/external/f2fs-tools/+/2825403 Change-Id: Ibd293c378792c5cb869f95f07ac663591edb44ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10Upgrade f2fs-tools to f71fbf8f3dee4eefdddac1abaaf4ae76bb9a48b3 am: ↵Jaegeuk Kim
f5d5adbf61 am: d7509c7dd3 Original change: https://android-review.googlesource.com/c/platform/external/f2fs-tools/+/2825403 Change-Id: I9904f3b1e3f4954c7594301299481159cf4b9183 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10Upgrade f2fs-tools to f71fbf8f3dee4eefdddac1abaaf4ae76bb9a48b3 am: ↵Jaegeuk Kim
f5d5adbf61 am: fbada0bc73 Original change: https://android-review.googlesource.com/c/platform/external/f2fs-tools/+/2825403 Change-Id: I9639e2a45fb50a1bb367758263f0638075fcb6d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10Upgrade f2fs-tools to f71fbf8f3dee4eefdddac1abaaf4ae76bb9a48b3 am: f5d5adbf61Jaegeuk Kim
Original change: https://android-review.googlesource.com/c/platform/external/f2fs-tools/+/2825403 Change-Id: I1f29cf6f38671d00a45db52aa5900e3d0e0d918c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10Upgrade f2fs-tools to f71fbf8f3dee4eefdddac1abaaf4ae76bb9a48b3 am: f5d5adbf61Jaegeuk Kim
Original change: https://android-review.googlesource.com/c/platform/external/f2fs-tools/+/2825403 Change-Id: Iec409a7b3b58a1e8e55759a8d775d2de7e25608c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09Upgrade f2fs-tools to f71fbf8f3dee4eefdddac1abaaf4ae76bb9a48b3android-u-rb-dp-10-gplandroid-u-rb-dp-10-gplJaegeuk Kim
This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update f2fs-tools For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md Test: TreeHugger Change-Id: Idd3be3787dc74ab1108a1f4cb36683a313cc361f
2023-11-08f2fs-tools: synchronize nat journal with nat cacheDaeho Jeong
Make nat journal and nat cache have the same content. Signed-off-by: Daeho Jeong <daehojeong@google.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2023-10-28fsck.f2fs: wrong report on xattr boundaryJaegeuk Kim
This avoids false alarm on xfstests/generic/425. Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2023-10-28f2fs-tools: use F2FS_BLKSIZE by defaultJaegeuk Kim
No need to do Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2023-10-28Snap for 11017726 from c911db8f360a60e587c1c03887ee2bce2edbe480 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I83c13511b033f96c3b635ec018620380dd37c46d
2023-10-27f2fs-tools: do not put CP_UMOUNT_FLAG for roll forward recoveryDaeho Jeong
If we write CP_UMOUNT_FLAG in fsck, f2fs will not do foll forward recovery even though it has to do. Signed-off-by: Daeho Jeong <daehojeong@google.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2023-10-27f2fs-tools: use total_node_count when creating a new node block in fsckDaeho Jeong
We might allocate more node blocks than total_valid_node_count, when we recreate quota files. Signed-off-by: Daeho Jeong <daehojeong@google.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2023-10-27f2fs-tools: ensure that unused xattr space is zeroizedEric Biggers
Make fsck.f2fs zeroize the unused xattr space, i.e. the space after the end of the zero-terminated xattr list, if it isn't already zeroized. This is important because the kernel currently does not explicitly zero-terminate the list when writing xattrs. So, the kernel relies on the unused space containing zeroes. Also, add a missing free() to fix a memory leak. Change-Id: I4b3216dfbd1bfade2536df7a92f47589ef2a31aa Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> (cherry picked from commit d860afaebd1e04839047d247fa5d1cfcdeaeefb6)
2023-10-27f2fs-tools: fix corrupted xattr entryDaeho Jeong
Detect and fix a corrupted xattr entry. Change-Id: Ie611d74392c82450309d32e6944c782edac6ca57 Signed-off-by: Daeho Jeong <daehojeong@google.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> (cherry picked from commit c9009e00d44dcaaab0cd25d3a15cdd673843f71f)
2023-10-27Merge cherrypicks of ['googleplex-android-review.googlesource.com/25151013', ↵android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseAndroid Build Coastguard Worker
'googleplex-android-review.googlesource.com/25151014', 'googleplex-android-review.googlesource.com/25177146'] into udc-qpr1-release. Change-Id: I52abcdfcc306a0a0fed09c7cf69bd9c5a97cb9cf
2023-10-27DO NOT MERGE - f2fs-tools: ensure that unused xattr space is zeroizedEric Biggers
Also add a missing free() to fix a memory leak. Bug: 305658663 Test: - On kernel with bug: - Created an f2fs filesystem - Created 250-byte xattr on a directory - Deleted the xattr - Ran fsck.f2fs -f - Mounted filesystem - On kernel without bug: - Created 200-byte xattr on the directory - Listed xattrs The last step shows corruption before this change, but not after it. Signed-off-by: Eric Biggers <ebiggers@google.com> (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f7c0ca9f8b02cbb199d0277c8aefb5098df9a867) Merged-In: I5ae77803113683887b3aaec804a0547ceb3d80c4 Change-Id: I5ae77803113683887b3aaec804a0547ceb3d80c4
2023-10-27DO NOT MERGE - f2fs-tools: fix corrupted xattr entryDaeho Jeong
Detect and fix a corrupted xattr entry. Bug: 305658663 Signed-off-by: Daeho Jeong <daehojeong@google.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d2f788271e6fb5f3ac1b3de4fac39ec5bad76129) Merged-In: Ib3c4d67d2fb8523306ca2502834579d7631ae513 Change-Id: Ib3c4d67d2fb8523306ca2502834579d7631ae513
2023-10-27DO NOT MERGE - f2fs-tools: do sanity check on xattr entryChao Yu
If there are corrupted xattr entries in xattr space, it may cause traversing across end of xattr space issue, this patch adds sanity check during xattr traverse to avoid such issue. This patch synchronizes kernel commits: 2777e654371d ("f2fs: fix to avoid accessing xattr across the boundary") 688078e7f36c ("f2fs: fix to avoid memory leakage in f2fs_listxattr") Bug: 305658663 Signed-off-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c208057ce971b24990fb6bd1fee7e39b90ee796e) Merged-In: Ib481ef79f4e0498098559f58066bcb6367d4de29 Change-Id: Ib481ef79f4e0498098559f58066bcb6367d4de29
2023-10-27Snap for 11012804 from 8afc33de807ec8286f8e1320001cb39060463a9f to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I0a54c0092cc32950fa191b7d816024ea8836af7e
2023-10-27Upgrade f2fs-tools to d860afaebd1e04839047d247fa5d1cfcdeaeefb6 am: ↵Jaegeuk Kim
a769fcac25 am: b7dc4767e5 am: 21bd7ec8b1 Original change: https://android-review.googlesource.com/c/platform/external/f2fs-tools/+/2805771 Change-Id: I0693cc63d53c7699e0b5ddd0db293aa3c9c19504 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27Upgrade f2fs-tools to d860afaebd1e04839047d247fa5d1cfcdeaeefb6 am: ↵Jaegeuk Kim
a769fcac25 am: d416e8d7bd am: 103c83cd38 Original change: https://android-review.googlesource.com/c/platform/external/f2fs-tools/+/2805771 Change-Id: I4d89b0b2c4aa0cc73d71cf286ce7a44f19107b18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27Upgrade f2fs-tools to d860afaebd1e04839047d247fa5d1cfcdeaeefb6 am: ↵Jaegeuk Kim
a769fcac25 am: b7dc4767e5 Original change: https://android-review.googlesource.com/c/platform/external/f2fs-tools/+/2805771 Change-Id: I5dab85db889b942f9b153d06f8890a67d3b4c099 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27Upgrade f2fs-tools to d860afaebd1e04839047d247fa5d1cfcdeaeefb6 am: ↵Jaegeuk Kim
a769fcac25 am: d416e8d7bd Original change: https://android-review.googlesource.com/c/platform/external/f2fs-tools/+/2805771 Change-Id: I358c748239ea640eec5a81700acb469a66ce37c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27Upgrade f2fs-tools to d860afaebd1e04839047d247fa5d1cfcdeaeefb6 am: a769fcac25Jaegeuk Kim
Original change: https://android-review.googlesource.com/c/platform/external/f2fs-tools/+/2805771 Change-Id: I5f79468b86dea4a8fb492815f38a9f9b59114aef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27Upgrade f2fs-tools to d860afaebd1e04839047d247fa5d1cfcdeaeefb6 am: a769fcac25Jaegeuk Kim
Original change: https://android-review.googlesource.com/c/platform/external/f2fs-tools/+/2805771 Change-Id: Id2c8ec4431142eb481d6f8590fdb45132aee99f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26f2fs-tools: make six open zone check resilientDaeho Jeong
We need to make sure to finish all the zones except six open zones. In a case of that the previous mount wasn't successfully unmounted, we have to change all the current segments. Signed-off-by: Daeho Jeong <daehojeong@google.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2023-10-26Upgrade f2fs-tools to d860afaebd1e04839047d247fa5d1cfcdeaeefb6Jaegeuk Kim
This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update f2fs-tools For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md Test: TreeHugger Change-Id: Id85b5101b7ee5021efe3aee84ebd3b1c498e143e
2023-10-26[automerger skipped] DO NOT MERGE - f2fs-tools: ensure that unused xattr ↵Eric Biggers
space is zeroized am: f7c0ca9f8b am: 51a297aadc am: ea48e068e7 am: beca973cb6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25177146 Change-Id: I0c74dcae00c30ed3543a78c06c55b8ef59adb306 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] DO NOT MERGE - f2fs-tools: fix corrupted xattr entry ↵Daeho Jeong
am: d2f788271e am: d22773c6ff am: 42cd5495f9 -s ours am: ee9ba7693e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25151014 Change-Id: Icf34b49c337fc35fdf2a6276bd17e38089afc126 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] DO NOT MERGE - f2fs-tools: do sanity check on xattr ↵Chao Yu
entry am: c208057ce9 am: 72c2d72a8c am: dc14141f5c -s ours am: 4d39d9f6ae -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25151013 Change-Id: If2816dd445689a6c49973fab3ae14c8fdeb543fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26DO NOT MERGE - f2fs-tools: ensure that unused xattr space is zeroized am: ↵Eric Biggers
f7c0ca9f8b am: 51a297aadc am: ea48e068e7 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25177146 Change-Id: Ia537c3caf47a46364e22c4a61c4130807e4cfbc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] DO NOT MERGE - f2fs-tools: fix corrupted xattr entry ↵Daeho Jeong
am: d2f788271e am: d22773c6ff am: 42cd5495f9 -s ours am skip reason: Merged-In Ib3c4d67d2fb8523306ca2502834579d7631ae513 with SHA-1 d2f788271e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25151014 Change-Id: Ibc833b6e6804d315d11a5d9cc0d07b4b9b11ba9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] DO NOT MERGE - f2fs-tools: do sanity check on xattr ↵Chao Yu
entry am: c208057ce9 am: 72c2d72a8c am: dc14141f5c -s ours am skip reason: Merged-In Iad8317251e684e4e1821a7de0a2c1addf897c934 with SHA-1 6a490fed57 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25151013 Change-Id: I8142e8221a9555948a2267f865726230e3120729 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26DO NOT MERGE - f2fs-tools: ensure that unused xattr space is zeroized am: ↵Eric Biggers
f7c0ca9f8b am: 51a297aadc Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25177146 Change-Id: I8f08d331c7cf55a33de192fb2a429c7da552a45c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26DO NOT MERGE - f2fs-tools: fix corrupted xattr entry am: d2f788271e am: ↵Daeho Jeong
d22773c6ff Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25151014 Change-Id: I38ed0357e3e76c63c08e386875db38162497bbb5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26DO NOT MERGE - f2fs-tools: do sanity check on xattr entry am: c208057ce9 am: ↵Chao Yu
72c2d72a8c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25151013 Change-Id: Id324086ac67c07de9043af7f6c2ede9e8b4a51cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] DO NOT MERGE - f2fs-tools: ensure that unused xattr ↵Eric Biggers
space is zeroized am: f7c0ca9f8b am: 8540e122d8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25177146 Change-Id: Id22e3dd4dfcee7275082c10ec408e2dd3c09768b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] DO NOT MERGE - f2fs-tools: fix corrupted xattr entry ↵Daeho Jeong
am: d2f788271e am: 02cf767c7c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25151014 Change-Id: Ida567f1c76e3aec878aeda04e4618737c1b506d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] DO NOT MERGE - f2fs-tools: do sanity check on xattr ↵Chao Yu
entry am: c208057ce9 am: 2016fcf43a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25151013 Change-Id: I87babb4f1234bd2bed98795d48a12a8b387ad86b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] DO NOT MERGE - f2fs-tools: ensure that unused xattr ↵Eric Biggers
space is zeroized am: f7c0ca9f8b am: 11ef526df0 am: 8ad9ffddfe -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25177146 Change-Id: Ic99ab65fd537276c8c896058f3e35d30b96f55c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] DO NOT MERGE - f2fs-tools: fix corrupted xattr entry ↵Daeho Jeong
am: d2f788271e -s ours am: 52c3627da5 -s ours am: 5325614163 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25151014 Change-Id: I7701f691d20b876a16bbe31d22997b1edbe34699 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] DO NOT MERGE - f2fs-tools: do sanity check on xattr ↵Chao Yu
entry am: c208057ce9 -s ours am: fb1e30e42b -s ours am: 1f96952961 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25151013 Change-Id: Id0e21aab017c6d450b99b32c218dabec82a97c3e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26DO NOT MERGE - f2fs-tools: ensure that unused xattr space is zeroized am: ↵Eric Biggers
f7c0ca9f8b Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25177146 Change-Id: I1a494218558a1ba3a841fb028cbe0e6866ae6f76 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26DO NOT MERGE - f2fs-tools: fix corrupted xattr entry am: d2f788271eDaeho Jeong
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/25151014 Change-Id: I612372d2023406a38290399d436da6ba5acb48c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>