summaryrefslogtreecommitdiff
path: root/fs/ext4/inline.c (follow)
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'common/android-4.4-p' into lineage-18.1-caf-msm...Michael Bestas2021-10-12
|\
| * Merge 4.4.284 into android-4.4-pGreg Kroah-Hartman2021-09-22
| |\
| | * ext4: fix race writing to an inline_data file while its xattrs are changingTheodore Ts'o2021-09-22
* | | Merge branch 'android-4.4-p' of https://android.googlesource.com/kernel/commo...Michael Bestas2020-12-09
|\| |
| * | Merge 4.4.244 into android-4.4-pGreg Kroah-Hartman2020-11-18
| |\|
| | * ext4: unlock xattr_sem properly in ext4_inline_data_truncate()Joseph Qi2020-11-18
* | | Merge branch 'android-4.4-p' of https://android.googlesource.com/kernel/commo...Michael Bestas2020-03-08
|\| |
| * | Merge 4.4.212 into android-4.4-pGreg Kroah-Hartman2020-01-29
| |\|
| | * ext4: set error return correctly when ext4_htree_store_dirent failsColin Ian King2020-01-29
| * | Merge 4.4.171 into android-4.4-pGreg Kroah-Hartman2019-01-16
| |\|
| * | Merge 4.4.170 into android-4.4-pGreg Kroah-Hartman2019-01-13
| |\ \
| * \ \ Merge 4.4.164 into android-4.4-pGreg Kroah-Hartman2018-11-21
| |\ \ \
| * \ \ \ Merge 4.4.159 into android-4.4-pGreg Kroah-Hartman2018-09-29
| |\ \ \ \
| * \ \ \ \ Merge 4.4.146 into android-4.4-pGreg Kroah-Hartman2018-08-06
| |\ \ \ \ \
* | \ \ \ \ \ Merge android-4.4.171 (b355d4f) into msm-4.4Srinivasarao P2019-01-29
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge 4.4.171 into android-4.4Greg Kroah-Hartman2019-01-16
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | ext4: fix a potential fiemap/page fault deadlock w/ inline_dataTheodore Ts'o2019-01-16
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge android-4.4.170 (241f76b1) into msm-4.4Srinivasarao P2019-01-25
|\| | | | | |
| * | | | | | Merge 4.4.170 into android-4.4Greg Kroah-Hartman2019-01-13
| |\| | | | |
| | * | | | | ext4: missing unlock/put_page() in ext4_try_to_write_inline_data()Maurizio Lombardi2019-01-13
| | | |_|_|/ | | |/| | |
* | | | | | Merge android-4.4.164 (564ce1b) into msm-4.4Srinivasarao P2018-11-21
|\| | | | |
| * | | | | Merge 4.4.164 into android-4.4Greg Kroah-Hartman2018-11-21
| |\| | | |
| | * | | | ext4: avoid running out of journal credits when appending to an inline fileTheodore Ts'o2018-11-21
| | * | | | ext4: initialize retries variable in ext4_da_write_inline_data_begin()Lukas Czerner2018-11-21
| | | |_|/ | | |/| |
* | | | | Merge android-4.4.159 (624c095) into msm-4.4Srinivasarao P2018-10-08
|\| | | |
| * | | | Merge 4.4.159 into android-4.4Greg Kroah-Hartman2018-09-29
| |\| | |
| | * | | ext4: avoid divide by zero fault when deleting corrupted inline directoriesTheodore Ts'o2018-09-29
| | | |/ | | |/|
* | | | Merge android-4.4.146 (13962260) into msm-4.4Srinivasarao P2018-08-07
|\| | |
| * | | Merge 4.4.146 into android-4.4Greg Kroah-Hartman2018-08-06
| |\| | | | |/ | |/|
| | * ext4: fix inline data updates with checksums enabledTheodore Ts'o2018-08-06
* | | Merge android-4.4.140 (789274d) into msm-4.4Blagovest Kolenichev2018-07-18
|\| |
| * | Merge 4.4.140 into android-4.4Greg Kroah-Hartman2018-07-11
| |\|
| | * ext4: clear i_data in ext4_inode_info when removing inline dataTheodore Ts'o2018-07-11
* | | Merge android-4.4.129 (b1c4836) into msm-4.4Srinivasarao P2018-04-24
|\| |
| * | Merge 4.4.129 into android-4.4Greg Kroah-Hartman2018-04-24
| |\|
| | * ext4: fix deadlock between inline_data and ext4_expand_extra_isize_ea()Theodore Ts'o2018-04-24
* | | Merge branch 'android-4.4@c71ad0f' into branch 'msm-4.4'Blagovest Kolenichev2017-04-20
|\| |
| * | Merge 4.4.48 into android-4.4Greg Kroah-Hartman2017-03-30
| |\|
| | * ext4: mark inode dirty after converting inline directoryEric Biggers2017-03-30
| * | ext4: fix inline data error pathsTheodore Ts'o2017-03-12
| |\|
| * | Merge remote-tracking branch 'common/android-4.4' into android-4.4.yDmitry Shmidt2017-02-15
| |\ \
| | * | ANDROID: Refactor fs readpage/write tracepoints.Mohan Srinivasan2017-02-10
| * | | Merge tag 'v4.4.40' into android-4.4.yDmitry Shmidt2017-01-09
| |\ \ \ | | |/ / | |/| |
| * | | ANDROID: fs: FS tracepoints to track IO.Mohan Srinivasan2016-09-20
* | | | ANDROID: Refactor fs readpage/write tracepoints.Mohan Srinivasan2017-04-17
* | | | ANDROID: fs: FS tracepoints to track IO.Mohan Srinivasan2017-04-17
* | | | Merge tag v4.4.55 into branch 'msm-4.4'Blagovest Kolenichev2017-03-23
|\ \ \ \ | | |_|/ | |/| |
| * | | ext4: fix inline data error pathsTheodore Ts'o2017-03-12
| | |/ | |/|
* | | Merge tag 'lsk-v4.4-17.02-android' into branch 'msm-4.4'Runmin Wang2017-03-18
|\ \ \
| * | | Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidAlex Shi2017-01-09
| |\| |