summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-05Merge "Add aosp patch to fix filesystem check fail when mounting." am: ↵android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Treehugger Robot
b1b772592b Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1696727 Change-Id: If7a8744689d58c16da2b5dd526ca4a3fcf15bf07
2021-05-05Merge "Add aosp patch to fix filesystem check fail when mounting."android-s-beta-2android-s-beta-1Treehugger Robot
2021-05-05Add aosp patch to fix filesystem check fail when mounting.silver.chen
Modify files: 1. external/fsck_msdos/check.c Root Cause: fsck_msdos will return 4 after repairing file system on An P. After An Q, this action become return 8, which lead to file system check failed. Solution: We manually change return value to 4 to resolve this issue. when return value is 4, vold will retry fsck multiple time, so we don't have to unplug and plug the device. Test: 1. build pass. Bug: 186611822 Change-Id: I9780b4b894463780b179cf0f6042883df0a12a71
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I6f44ea5bd17b226a3b39fafe620df5f23d8f9533 Change-Id: Ia7ca4a5c9c59ede8603f55bcb16a5933609dddc2
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/fsck_msdos" am: 6e5f8806deTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1588930 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3920200e31acdb1ac641fe0cbb9b489e1d4cfee6
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/fsck_msdos"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/fsck_msdosBob Badour
Added SPDX-license-identifier-BSD to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ib930f7a56774c1ae2528cbe1e1acdd0ff14965c5
2020-11-24Mark ab/6881855 as merged am: 151bed9fc0Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/fsck_msdos/+/13111705 Change-Id: I6f44ea5bd17b226a3b39fafe620df5f23d8f9533
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Iee171f5cc41e989e8aa5ced5f1c26e3c2821fb61
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 2b48521b99 -s ours am: ↵Xin Li
f465ed1d7b -s ours am skip reason: Change-Id Id00ea78fa38c23a3eacc581af38f02be7f39630b with SHA-1 430ef1c7b7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/fsck_msdos/+/12797239 Change-Id: I481df6be1b01d3afcb81baed00b83be7c6b5b631
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 2b48521b99 -s oursXin Li
am skip reason: Change-Id Id00ea78fa38c23a3eacc581af38f02be7f39630b with SHA-1 430ef1c7b7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/fsck_msdos/+/12797239 Change-Id: I3f5d0687dbac7c4907af86de2b938a31dea0214d
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Id00ea78fa38c23a3eacc581af38f02be7f39630b Change-Id: I1783eac938f55ec5f5e560cd2cb928487b121d48
2020-09-23Merge "Sync with upstream 667eef4ac (svn revision 366064 + 366065)." am: ↵Treehugger Robot
b86e97b62c am: a1c9005dc8 am: c6bf77e339 am: c4caef411a Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1434752 Change-Id: I78bab79efc1361f9164c5e3757db15f9723a9dee
2020-09-23Merge "Sync with upstream 667eef4ac (svn revision 366064 + 366065)." am: ↵Treehugger Robot
b86e97b62c am: a1c9005dc8 am: c6bf77e339 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1434752 Change-Id: Ic1ebc9d76b70497c058f94b75baad8c2b269e455
2020-09-23Merge "Sync with upstream 667eef4ac (svn revision 366064 + 366065)." am: ↵Treehugger Robot
b86e97b62c am: a1c9005dc8 Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1434752 Change-Id: Ib6032533fcbc77dd2b14134bcae4499e6148f2df
2020-09-23Merge "Sync with upstream 667eef4ac (svn revision 366064 + 366065)." am: ↵Treehugger Robot
b86e97b62c Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1434752 Change-Id: I85e35d0d2e1f369ca4587a0cecce19cbd506b539
2020-09-23Merge "Sync with upstream 667eef4ac (svn revision 366064 + 366065)."Treehugger Robot
2020-09-23Sync with upstream 667eef4ac (svn revision 366064 + 366065).Xin Li
Fix an integer overflow on 32-bit platforms. The purpose of checksize() is to verify that the referenced cluster chain size matches the recorded file size (up to 2^32 - 1) in the directory entry. We follow the cluster chain, then multiple the cluster count by bytes per cluster to get the physical size, then check it against the recorded size. When a file is close to 4 GiB (between 4GiB - cluster size and 4GiB, both non-inclusive), the product of cluster count and bytes per cluster would be exactly 4 GiB. On 32-bit systems, because size_t is 32-bit, this would wrap back to 0, which will cause the file be truncated to 0. Fix this by using 64-bit physicalSize instead. Bug: 167345711 Change-Id: Ica05e89fdbf3c9078a0939be340a045e00460eb0
2020-09-23Import revision 667eef4ac6396ffe2d705b401a2a09f60ab38fe7 from FreeBSD.Xin Li
Change-Id: I23f5307232024b7ddabb6441cb1b6cd4e8aab641
2020-09-23Import revision 4b0089abdf36a27fda364b25e95706a0abfe6c3a from FreeBSD.Xin Li
Change-Id: Ib131afe8f995a1847f2f8090c62b288177f6c23b
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: ↵Xin Li
b0ad11e60a am: 0fa08a6c46 am: c2885567d2 Change-Id: I7350e223cc9581cd155bed6d5fcd7a3dc5fb8aee
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: ↵Xin Li
063c1723a6 am: 430ef1c7b7 Change-Id: I67df1425c7039a8b57e0c8a02b77b2361ff766a6
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: ↵Xin Li
b0ad11e60a am: 0fa08a6c46 Change-Id: I8144d81ac24ad4318d6dc758492faa32ea79be89
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: ↵Xin Li
b0ad11e60a am: 3615221bfd Change-Id: Icd36a6b0f2117383a8960e25afd8b4f0a7c55357
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: 063c1723a6Xin Li
Change-Id: Id00ea78fa38c23a3eacc581af38f02be7f39630b
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: b0ad11e60aXin Li
Change-Id: I2a3832af2ee31734b588dbb01e07f3c054d254df
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8 am: b0ad11e60aandroid-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseXin Li
Change-Id: I52bbe5e34f427aa1ff3c8d827e9731f8ddd55e01
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8android-11.0.0_r16android11-d1-b-releaseXin Li
Change-Id: I30630b11f1f0c4af46a31282f90f8f79585b8b4a
2020-04-28Sync with upstream 2ccadef (svn revision 360428): am: 4f36a18db8Xin Li
Change-Id: I5e78f6975c2617a31e0878c7a12253e9f65c5aba
2020-04-28Merge "Sync with upstream 2ccadef (svn revision 360428):" am: 8bc9cb1ca2 am: ↵Treehugger Robot
2f294595d9 am: 9601c6e26e am: 25f59e1524 Change-Id: If7bb22a7ffd022dcb7f91fb16e309fdde4b83281
2020-04-28Merge "Sync with upstream 2ccadef (svn revision 360428):" am: 8bc9cb1ca2 am: ↵Treehugger Robot
2f294595d9 am: 9601c6e26e Change-Id: I520d787407afc664f3c3767ec0e0942e5d40dd20
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: ↵Xin Li
376a7abc57 am: 62a8e9a842 am: 6d8a0e1b62 Change-Id: Ibabd8401de484b5b5cf86560edc13f44add84f59
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: ↵Xin Li
376a7abc57 am: 641ad04bd1 Change-Id: I4cde52d7b42c4d9d357638f3d790ef8028ac4b95
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: ↵Xin Li
ce649bb773 am: 93caedf4af Change-Id: I86f03fb6ff2f1d3b03513b30b89332e96803c025
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: ↵Xin Li
376a7abc57 am: 62a8e9a842 Change-Id: Idf0158b8d1e38cd7cb70749c739dd8471d1adb29
2020-04-28Merge "Sync with upstream 2ccadef (svn revision 360428):" am: 8bc9cb1ca2 am: ↵Treehugger Robot
2f294595d9 Change-Id: I4dca6a3e3f00ca533d2d7027b9665f79a8e58ae1
2020-04-28Sync with upstream 2ccadef (svn revision 360428):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-releaseandroid11-devXin Li
Do not overflow when calculating file system size. Test: build Bug: 155183047 Change-Id: I05a8f1b3ef10ec6a765a78adf122f274dcda12cd
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: 376a7abc57Xin Li
Change-Id: I97da4c79f3ac399a0d65a9147380e550f9294bc5
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: ce649bb773Xin Li
Change-Id: I63d0dbdeebb556451e38240d55559fdc48213fa5
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04 am: 376a7abc57Xin Li
Change-Id: I8b46ccc81121f09df4ce67f072e542c5270a3793
2020-04-28Merge "Sync with upstream 2ccadef (svn revision 360428):" am: 8bc9cb1ca2android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I87348a0d218cfd407f29b13a16262b4eded0c7f4
2020-04-28Merge "Sync with upstream 2ccadef (svn revision 360428):"Treehugger Robot
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04Xin Li
Change-Id: I108069a860bedb0edc799f6b1bef61f4c600f94a
2020-04-28Sync with upstream ffa3961 (svn revision 360359): am: 05ca3f4d04Xin Li
Change-Id: I82b996c846bd04ecd8c852d399c1ea7d71caadc6
2020-04-28Sync with upstream 2ccadef (svn revision 360428):Xin Li
Do not overflow when calculating file system size. Test: build Bug: 155183047 Change-Id: I05a8f1b3ef10ec6a765a78adf122f274dcda12cd
2020-04-28Import revision 2ccadef77b81e7f18dd6bc4380357d6c6a797c5a from FreeBSD.Xin Li
Change-Id: I7293281cb5d1b0b01163e1f23b36bfb7c31a0a2e
2020-04-27Sync with upstream ffa3961 (svn revision 360359):Xin Li
ffa3961: Fix a bug with dirty file system handling. r356313 broke handling of dirty file system because we have restricted the correction of "odd" byte sequences to checkfat(), and as a result the dirty bit is never cleared. The old fsck_msdosfs code would write FAT twice to fix the dirty bit, which is also not ideal. Fix this by introducing a new rountine, cleardirty() which will perform the set of clean bit only, and use it in checkfilesys() if we thought the file system was dirty. 996c6ae: Use humanize_number to format available and bad space sizes. (Visible change is the addition of KiB suffix in fsck_msdos summary on Android as we don't currently have humanize_number which supports larger numbers) 28bbeac: Diff reduction against NetBSD, no functional change. Bug: 155081558 Test: build Change-Id: I352ad474215fd340399697c0606d69687c8189d1
2020-04-27Merge "Sync with upstream ffa3961 (svn revision 360359):" am: 2282fc83db am: ↵Treehugger Robot
260d7b8a7a am: 7efe0bf656 am: 7b2273145d Change-Id: I10db9cc108938c3a3855b288c4d85b81e726c76a
2020-04-27Merge "Sync with upstream ffa3961 (svn revision 360359):" am: 2282fc83db am: ↵Treehugger Robot
260d7b8a7a am: 7efe0bf656 Change-Id: I4981467418ad86b41ed9bbd6cfb87dfb1c0d4657
2020-04-27Merge "Sync with upstream ffa3961 (svn revision 360359):" am: 2282fc83db am: ↵Treehugger Robot
260d7b8a7a Change-Id: I85a9297a7f03c34698de954579fa24b154d7545f
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 06:14:18 +0000