Snap for 8082415 from 7d219adecf to android12-5.10-keystone-qcom-release

Change-Id: Iea897846a90887d4f2760b6d306a0c222fb7990e

android/abi_gki_aarch64_asus

@@ -0,0 +1,280 @@
+[abi_symbol_list]
+add_to_page_cache_locked
+__alloc_pages_nodemask
+__arch_copy_from_user
+__arch_copy_to_user
+arm64_const_caps_ready
+autoremove_wake_function
+balance_dirty_pages_ratelimited
+bcmp
+bdev_read_only
+__bforget
+bio_add_page
+bio_alloc_bioset
+bio_associate_blkg
+bio_put
+__bitmap_weight
+bit_waitqueue
+blkdev_issue_discard
+blkdev_issue_flush
+blk_finish_plug
+blk_start_plug
+__blockdev_direct_IO
+block_invalidatepage
+block_is_partially_uptodate
+__breadahead
+__bread_gfp
+__brelse
+buffer_migrate_page
+__cancel_dirty_page
+capable
+capable_wrt_inode_uidgid
+__cfi_slowpath
+__check_object_size
+clean_bdev_aliases
+__cleancache_invalidate_inode
+clear_inode
+clear_page
+clear_page_dirty_for_io
+complete_and_exit
+cpu_hwcap_keys
+cpu_hwcaps
+create_empty_buffers
+current_umask
+d_add
+d_add_ci
+delete_from_page_cache
+d_instantiate
+d_make_root
+d_obtain_alias
+down_read
+down_write
+down_write_trylock
+dput
+drop_nlink
+d_splice_alias
+dump_stack
+end_buffer_read_sync
+end_buffer_write_sync
+end_page_writeback
+errseq_set
+failure_tracking
+fget
+fiemap_fill_next_extent
+fiemap_prep
+filemap_fault
+filemap_fdatawait_range
+filemap_fdatawrite
+filemap_flush
+__filemap_set_wb_err
+filemap_write_and_wait_range
+file_remove_privs
+file_update_time
+file_write_and_wait_range
+filp_close
+filp_open
+finish_wait
+flush_dcache_page
+fput
+freezing_slow_path
+fs_bio_set
+generic_error_remove_page
+generic_file_direct_write
+generic_file_llseek
+generic_file_mmap
+generic_file_open
+generic_file_read_iter
+generic_file_splice_read
+generic_fillattr
+generic_perform_write
+generic_read_dir
+generic_write_checks
+__getblk_gfp
+gic_nonsecure_priorities
+grab_cache_page_write_begin
+iget5_locked
+igrab
+ihold
+ilookup5
+inc_nlink
+in_group_p
+__init_rwsem
+init_special_inode
+init_wait_entry
+__init_waitqueue_head
+inode_dio_wait
+inode_init_once
+inode_init_owner
+inode_newsize_ok
+inode_set_flags
+__insert_inode_hash
+invalidate_bdev
+invalidate_mapping_pages
+io_schedule
+iov_iter_advance
+iov_iter_alignment
+iov_iter_copy_from_user_atomic
+iov_iter_fault_in_readable
+iov_iter_get_pages
+iov_iter_single_seg_count
+iput
+is_bad_inode
+iter_file_splice_write
+iunique
+jiffies
+kasan_flag_enabled
+kfree
+kill_block_super
+__kmalloc
+kmalloc_caches
+kmem_cache_alloc
+kmem_cache_alloc_trace
+kmem_cache_create
+kmem_cache_create_usercopy
+kmem_cache_destroy
+kmem_cache_free
+kthread_create_on_node
+kthread_should_stop
+kthread_stop
+ktime_get_coarse_real_ts64
+kvfree
+__list_add_valid
+__list_del_entry_valid
+ll_rw_block
+load_nls
+load_nls_default
+__lock_buffer
+__lock_page
+lru_cache_add
+make_bad_inode
+mark_buffer_async_write
+mark_buffer_dirty
+mark_buffer_write_io_error
+__mark_inode_dirty
+mark_page_accessed
+memcmp
+memcpy
+memmove
+memset
+mktime64
+mnt_drop_write_file
+mnt_want_write_file
+module_layout
+mount_bdev
+mpage_readahead
+mpage_readpage
+__mutex_init
+mutex_lock
+mutex_trylock
+mutex_unlock
+new_inode
+notify_change
+pagecache_get_page
+page_cache_next_miss
+page_cache_prev_miss
+page_mapped
+__page_pinner_migration_failed
+pagevec_lookup_range
+pagevec_lookup_range_tag
+__pagevec_release
+page_zero_new_buffers
+__percpu_down_read
+preempt_schedule
+preempt_schedule_notrace
+prepare_to_wait
+prepare_to_wait_event
+printk
+__printk_ratelimit
+__put_page
+put_pages_list
+___ratelimit
+_raw_read_lock
+_raw_read_lock_irqsave
+_raw_read_unlock
+_raw_read_unlock_irqrestore
+_raw_spin_lock
+_raw_spin_lock_irqsave
+_raw_spin_unlock
+_raw_spin_unlock_irqrestore
+_raw_write_lock
+_raw_write_lock_irqsave
+_raw_write_unlock
+_raw_write_unlock_irqrestore
+rcuwait_wake_up
+readahead_gfp_mask
+read_cache_page
+redirty_page_for_writepage
+__refrigerator
+register_filesystem
+__remove_inode_hash
+sb_min_blocksize
+sb_set_blocksize
+schedule
+schedule_timeout_interruptible
+security_inode_init_security
+seq_printf
+setattr_prepare
+set_freezable
+set_nlink
+set_page_dirty
+__set_page_dirty_buffers
+__set_page_dirty_nobuffers
+set_user_nice
+simple_strtol
+simple_strtoul
+simple_strtoull
+snprintf
+sprintf
+sscanf
+__stack_chk_fail
+__stack_chk_guard
+strchr
+strcmp
+strlen
+strncasecmp
+strncmp
+strsep
+strstr
+submit_bh
+submit_bio
+sync_blockdev
+__sync_dirty_buffer
+sync_dirty_buffer
+sync_filesystem
+sync_inode_metadata
+system_freezing_cnt
+sys_tz
+tag_pages_for_writeback
+__test_set_page_writeback
+time64_to_tm
+timestamp_truncate
+touch_atime
+truncate_inode_pages
+truncate_inode_pages_final
+truncate_pagecache
+truncate_setsize
+try_to_release_page
+try_to_writeback_inodes_sb
+unload_nls
+unlock_buffer
+unlock_new_inode
+unlock_page
+unmap_mapping_range
+unregister_filesystem
+up_read
+up_write
+vfree
+vfs_fsync_range
+vmalloc
+__vmalloc
+vsnprintf
+vzalloc
+__wait_on_buffer
+wait_on_page_bit
+wake_bit_function
+__wake_up
+wake_up_process
+__warn_printk
+write_inode_now
+write_one_page
+xa_load

android/abi_gki_aarch64_oplus

@@ -893,6 +893,7 @@
   freezing_slow_path
   freq_qos_add_notifier
   freq_qos_add_request
+  freq_qos_remove_notifier
   freq_qos_remove_request
   freq_qos_update_request
   freq_scale

build.config.gki.aarch64

@@ -28,6 +28,7 @@ android/abi_gki_aarch64_unisoc
 android/abi_gki_aarch64_virtual_device
 android/abi_gki_aarch64_vivo
 android/abi_gki_aarch64_xiaomi
+android/abi_gki_aarch64_asus
 "
 
 FILES="${FILES}

fs/configfs/mount.c

@@ -173,6 +173,7 @@ static void __exit configfs_exit(void)
 
 MODULE_AUTHOR("Oracle");
 MODULE_LICENSE("GPL");
+MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver);
 MODULE_VERSION("0.0.2");
 MODULE_DESCRIPTION("Simple RAM filesystem for user driven kernel subsystem configuration.");
 

fs/f2fs/dir.c

@@ -1002,6 +1002,7 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d,
 	struct f2fs_sb_info *sbi = F2FS_I_SB(d->inode);
 	struct blk_plug plug;
 	bool readdir_ra = sbi->readdir_ra == 1;
+	bool found_valid_dirent = false;
 	int err = 0;
 
 	bit_pos = ((unsigned long)ctx->pos % d->max);
@@ -1016,13 +1017,15 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d,
 
 		de = &d->dentry[bit_pos];
 		if (de->name_len == 0) {
-			bit_pos++;
-			ctx->pos = start_pos + bit_pos;
+			if (found_valid_dirent || !bit_pos) {
 				printk_ratelimited(
 					"%sF2FS-fs (%s): invalid namelen(0), ino:%u, run fsck to fix.",
 					KERN_WARNING, sbi->sb->s_id,
 					le32_to_cpu(de->ino));
 				set_sbi_flag(sbi, SBI_NEED_FSCK);
+			}
+			bit_pos++;
+			ctx->pos = start_pos + bit_pos;
 			continue;
 		}
 
@@ -1065,6 +1068,7 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d,
 			f2fs_ra_node_page(sbi, le32_to_cpu(de->ino));
 
 		ctx->pos = start_pos + bit_pos;
+		found_valid_dirent = true;
 	}
 out:
 	if (readdir_ra)