Eric Biggers 7dda6587ab ANDROID: ext4: fix mis-merge with encrypt+casefold support ...

Fix a mis-merge between upstream commit 7303cb5bfe ("ext4: fix
checking of directory entry validity for inline directories") and
ANDROID commit 705a3e5b18 ("ANDROID: ext4: Handle casefolding with
encryption").

Fixes: e6d1601bb0 ("Merge 5.9-rc2 into android-mainline")
Bug: 161184936
Cc: Daniel Rosenberg <drosen@google.com>
Cc: Paul Lawrence <paullawrence@google.com>
Cc: Sandeep Patil <sspatil@google.com>
Change-Id: I6b1e51ba24ba35b15821c856b0d8ebb860a8f8cb
Signed-off-by: Eric Biggers <ebiggers@google.com>

2020-09-14 11:20:16 -07:00

..

acl.c

ext4: handle ext4_mark_inode_dirty errors

2020-06-03 23:16:50 -04:00

acl.h

…

balloc.c

ext4: indicate via a block bitmap read is prefetched via a tracepoint

2020-08-07 14:12:35 -04:00

bitmap.c

…

block_validity.c

ext4: correctly restore system zone info when remount fails

2020-08-07 14:12:37 -04:00

dir.c

ANDROID: ext4: Handle casefolding with encryption

2020-06-25 18:38:07 +00:00

ext4_extents.h

ext4: fix EXT_MAX_EXTENT/INDEX to check for zeroed eh_max

2020-06-03 23:16:49 -04:00

ext4_jbd2.c

ext4: abort the filesystem if failed to async write metadata buffer

2020-08-07 14:12:34 -04:00

ext4_jbd2.h

ext4: drop ext4_journal_free_reserved()

2020-06-03 23:16:53 -04:00

ext4.h

Merge 5.9-rc2 into android-mainline

2020-08-24 10:01:23 +02:00

extents_status.c

ext4: remove unnecessary comparisons to bool

2020-06-03 23:16:49 -04:00

extents_status.h

ext4: fix extent_status trace points

2020-01-25 02:03:03 -05:00

extents.c

ext4: limit the length of per-inode prealloc list

2020-08-19 12:04:36 -04:00

file.c

Merge 5.9-rc2 into android-mainline

2020-08-24 10:01:23 +02:00

fsmap.c

ext4: fix miscellaneous sparse warnings

2019-05-12 04:49:47 -04:00

fsmap.h

…

fsync.c

Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2020-06-05 16:19:28 -07:00

hash.c

Merge 5.9-rc2 into android-mainline

2020-08-24 10:01:23 +02:00

ialloc.c

Merge 5.8-rc2 into android-mainline

2020-06-27 09:48:57 +02:00

indirect.c

ext4: limit the length of per-inode prealloc list

2020-08-19 12:04:36 -04:00

inline.c

Merge 5.9-rc2 into android-mainline

2020-08-24 10:01:23 +02:00

inode-test.c

kunit: allow kunit tests to be loaded as a module

2020-01-09 16:42:29 -07:00

inode.c

Merge 5.9-rc3 into android-mainline

2020-08-31 19:51:25 +02:00

ioctl.c

ext4: limit the length of per-inode prealloc list

2020-08-19 12:04:36 -04:00

Kconfig

ext4: replace HTTP links with HTTPS ones

2020-08-06 01:01:57 -04:00

Makefile

ext4: support xattr gnu.* namespace for the Hurd

2020-06-12 13:23:34 -04:00

mballoc.c

ext4: limit the length of per-inode prealloc list

2020-08-19 12:04:36 -04:00

mballoc.h

ext4: limit the length of per-inode prealloc list

2020-08-19 12:04:36 -04:00

migrate.c

ext4: handle ext4_mark_inode_dirty errors

2020-06-03 23:16:50 -04:00

mmp.c

ext4: save all error info in save_error_info() and drop ext4_set_errno()

2020-04-01 17:29:06 -04:00

move_extent.c

ext4: limit the length of per-inode prealloc list

2020-08-19 12:04:36 -04:00

namei.c

ANDROID: ext4: fix mis-merge with encrypt+casefold support

2020-09-14 11:20:16 -07:00

page-io.c

ext4: add inline encryption support

2020-07-08 10:29:43 -07:00

readpage.c

Merge 5.9-rc2 into android-mainline

2020-08-24 10:01:23 +02:00

resize.c

ext4: fix potential race between s_flex_groups online resizing and access

2020-02-21 19:31:46 -05:00

super.c

Merge 5.9-rc2 into android-mainline

2020-08-24 10:01:23 +02:00

symlink.c

…

sysfs.c

ext4: limit the length of per-inode prealloc list

2020-08-19 12:04:36 -04:00

truncate.h

ext4: handle layout changes to pinned DAX mappings

2018-07-29 17:00:22 -04:00

verity.c

Merge tag 'ext4-for-linus-5.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2020-06-15 09:32:10 -07:00

xattr_hurd.c

Merge 5.8-rc2 into android-mainline

2020-06-27 09:48:57 +02:00

xattr_security.c

FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr

2019-11-05 13:50:57 -08:00

xattr_trusted.c

FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr

2019-11-05 13:50:57 -08:00

xattr_user.c

FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr

2019-11-05 13:50:57 -08:00

xattr.c

ext4: delete unnecessary checks before brelse()

2020-08-06 00:08:56 -04:00

xattr.h

ext4: support xattr gnu.* namespace for the Hurd

2020-06-12 13:23:34 -04:00